adding
Merge branch 'master' of https://github.com/theKristi/GameDev_spring14

Conflicts:
	TombRacer/bin/TombRacer.swf