Bad commit
Merge branch 'master' of https://github.com/skogshjort/flux
World managing and other stuff