commit
Merge branch 'master' of github.com:albertnez/OpenGLTest

Conflicts:
	Game.cpp