updated world
Merge branch 'master' of github.com:darthduval/opengl

Conflicts:
	World.h
Merge branch 'master' of github.com:darthduval/opengl

Conflicts:
	World.cpp