things
Merge branch 'master' of https://github.com/tpham93/gj_game

Conflicts:
	TimeFreeze/SFML_GameTemplate/Classes/GameStates/InGame.cs
Merge branch 'master' of https://github.com/tpham93/gj_game
s
Merge branch 'master' of https://github.com/tpham93/gj_game

Conflicts:
	TimeFreeze/SFML_GameTemplate/Classes/GameStates/InGame.cs