Merge pull request #7 from krytaxion/master

Changes during Game Jam #2