attempt merge
Merge branch 'master' of github.com:filiperp/game_skeleton
update