Commiting so I can pull Scott's code; began work on grenade.
Merge branch 'master' of https://github.com/NGonGames/GGJ2013