Commit demand to change branches

I just ran it, didn't change a thing
Adding art to Credits screen
updating art
Adding Credits art
Adding Credits page art
adding font
Adding PowerTools
scrolling credits
blah
Added Hazard Map

todo: convert loader class to return array of classes
God, this sucks. I hope I'm not screwing with anything
Merge branch 'master' of https://github.com/theKristi/GameDev_spring14
another commit nothing changed

hkhxxoxp
Fixed credits back button
Moved TileMap organization

Getting crazy
adding TitleState
Merge remote-tracking branch 'origin/TitleState'

Conflicts:
	TombRacer/bin/TombRacer.swf
	TombRacer/obj/TombRacerConfig.old
	TombRacer/obj/TombRacerConfig.xml
Merge branch 'master' of https://github.com/theKristi/GameDev_spring14
editing Level selct bbbjho
kbcslj