Last minute stuff, panic, level changes.
Merge branch 'master' of https://github.com/tronster/ggj2014

# By Shawn Freeman (Laptop)
# Via Shawn Freeman (Laptop)
* 'master' of https://github.com/tronster/ggj2014:
  Final changes

Conflicts:
	games/GameModule/bin/Katseye.swf
	games/GameModule/src/BattleState.as