Updates
Merge branch 'master' of https://github.com/BenjamenB/Ajax-Adventure-Game
Merge branch 'development' of https://github.com/BenjamenB/Ajax-Adventure-Game into development