Finally there is some time for winners
Merge branch 'master' of github.com:Moe-/coopgame

Conflicts:
	world.lua