updates
Merge branch 'master' of https://github.com/miolsem/GameJamMask.git