Glow is working and the skybox is improved
Merge branch 'master' of https://github.com/dadleyy/Project-NN

Conflicts:
	Project-NN/Project-NN.vcxproj.filters
	Project-NN/ResourceManager.h
	Project-NN/states/TestState.cpp