Finished integrating input, and removed most of the extraneous code in TestState and StateManager
Merge branch 'master' of https://github.com/dadleyy/Project-NN

Conflicts:
	Project-NN/Project-NN/Main.cpp