Partial commit for merge.
Merge branch 'master' of https://github.com/nsipid/ludum26
Merge branch 'master' of https://github.com/nsipid/ludum26
broken
Merge branch 'master' of https://github.com/nsipid/ludum26