much more work done, with DUMB BUG
Merge branch 'master' of https://github.com/nik0kin/ludumdare28