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

Conflicts:
	TimeFreeze/SFML_GameTemplate/Classes/GameStates/InGame.cs
	TimeFreeze/SFML_GameTemplate/TimeFreeze.csproj
	TimeFreeze/TimeFreeze.v11.suo
- new ignore list