Last bugs I think
Merge branch 'master' of https://github.com/makerslocal/LudumDare30