added character.obj
fixed merge conflicts
Merge branch 'master' of https://github.com/austinhulse/SpaceGame

Conflicts:
	SpaceGame/GameDebugOutput.txt
	SpaceGame/GameObject.h
	SpaceGame/GameState.cpp
	SpaceGame/Render.cpp

fixed merge conflicts