INSTANCING!!
Merge branch 'master' of https://github.com/dadleyy/Project-NN

Conflicts:
	Project-NN/Main.cpp
	Project-NN/Project-NN.vcxproj
	Project-NN/Project-NN.vcxproj.filters
	Project-NN/entity/Drawable.cpp
	Project-NN/entity/Drawable.h
	Project-NN/entity/Enemy.cpp
	Project-NN/entity/PlayerCameraComponent.cpp
	Project-NN/entity/Spacecraft.cpp
	Project-NN/entity/Sphere.cpp
	Project-NN/entity/Sphere.h
	Project-NN/states/TestState.cpp
	Project-NN/states/TestState.h