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

Conflicts:
	glWidget.cpp