Committing what I have.
Merge branch 'master' of github.com:RebelMoogle/GlobalGameJam2014