Whoops.
Merge branch 'master' of github.com:yancouto/LabProgGame
Merge branch 'master' of github.com:yancouto/LabProgGame
Merge branch 'master' of github.com:yancouto/LabProgGame
Merge branch 'master' of github.com:yancouto/LabProgGame
Merge branch 'master' into OpenGL_Test

Conflicts:
	source/Enemy.c
Merge branch 'OpenGL_Test' of github.com:yancouto/LabProgGame into OpenGL_Test