Latest changes
Merge branch 'master' of https://github.com/GilbertTeam/Tales-Generator