Sync to shawn, merging conflicts.
blah
Merge branch 'master' of https://github.com/tronster/ggj2014

# By Shawn Freeman (Laptop)
# Via Shawn Freeman (Laptop)
* 'master' of https://github.com/tronster/ggj2014:
  2nd to last Saturday commit

Conflicts:
	games/GameModule/bin/Katseye.swf