Updated main.lua's reference to world.lua
Merge branch 'master' into dev

Made a silly mistake and commited a change to the wrong branch.