Merge branch 'master' of https://github.com/aliceandstuff/davin-game-jam
Fixing
Merge pull request #23 from onidavin/master

Fixing a merge error