hard codiiing tiimmme
Merge branch 'master' of https://github.com/Swofty/HackCMU-2014

Conflicts:
	CodeCrawler/bin/Maze.swf
Merge branch 'master' of https://github.com/Swofty/HackCMU-2014