i hope this works
Merge branch 'master' of https://github.com/barrymillham/Rugger_V4

Conflicts:
	RnD2/Colored Cube App.cpp
	RnD2/Enemy.cpp
	RnD2/GameObject.h