tugzhjkl
jhbgj
Merge branch 'master' of https://github.com/tpham93/gj_game
Merge branch 'master' of https://github.com/tpham93/gj_game
do smt
Merge branch 'master' of https://github.com/tpham93/gj_game

Conflicts:
	TimeFreeze/SFML_GameTemplate/Classes/Level/BlockObjects/Hourglass.cs
start Tut
Merge branch 'master' of https://github.com/tpham93/gj_game