merge conflicts. indenting differences. whoever uses spaces instead of tabs, please stop
Spaces to tabs. Keeps causing merge conflicts

Merge branch 'HEAD' of git@github.com:pmarq003/avengers.git

Conflicts:
	level.py
old stuff.
Fixed one of the replay bugs.. It no longer keeps running, sorry about that. There is still 1 more bug. If you die after doing a replay, it causes havic. Changes character to Ironman and completely bugs out if you try to do replay again. Any thoughts?
Merge branch 'HEAD' of git@github.com:pmarq003/avengers.git