Better Levels!!!111!1!!1!1!!1!!!
Merge branch 'master' of https://github.com/tpham93/gj_game

Conflicts:
	TimeFreeze/SFML_GameTemplate/Content/Level/map1.png
	TimeFreeze/SFML_GameTemplate/Content/Level/map4.txt