Merge branch 'addition/game_skeleton' #2