Hourglass added (doesn't do anything)
Merge branch 'master' of https://github.com/tpham93/gj_game

Conflicts:
	TimeFreeze/SFML_GameTemplate/Classes/Level/BlockObjects/Objects.cs
	TimeFreeze/SFML_GameTemplate/Classes/Level/Level.cs