Committing broken stuff so that Corey can fix

More specifically, flag non-functionality and memory leak.
Merge remote-tracking branch 'origin/master'

Conflicts:
	enemy.pyc
	engine.pyc