Merge branch 'master' of github.com:house22/edukte

Signed-off-by: Pedro Jimenez <pedroj.1822@gmail.com>
Merge branch 'master' of github.com:house22/edukte