Merge branch 'master' of https://github.com/WikiToLearn/WikiToLearn
Signed-off-by: Alessandro Tundo <alessandrotundo94@gmail.com>