first part of generator
Merge remote-tracking branch 'origin/masterOfAllThatIsEvil' into
masterOfAllThatIsEvil

Conflicts:
	SwampMonster/src/com/me/swampmonster/game/TheController.java