Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn
Signed-off-by: Toma Luca <toma.luca95@gmail.com>