Change object style (shaders)
Merge branch 'master' of github.com:Moe-/coopgame

Conflicts:
	world.lua