Merge branch 'master' of https://github.com/barooney/marchgamejam
Merge branch 'add-ways'