first commit
Merge branch 'master' of https://github.com/grifdail/ludum_dare_26