some debugging was done
Merge remote-tracking branch 'origin/master' into landonMOE
Added normals vector
Added normals functionality
Added normals functionality
Fixed copy error
started adding terrain setup
Merge branch 'master' of git@github.com:landonepps/MOE.git
removed comment
Merge remote-tracking branch 'origin/master' into landonMOE
Fixed a name error
Fixed some name errors
Fixed some logic errors
Got normals compiling
Working on collision with terrain
Merge remote-tracking branch 'origin/master' into landonMOE
correct player starting position
Polishing level changing
Merge branch 'master' of git@github.com:landonepps/MOE.git

Conflicts:
	FGame/src/OnLoop.cpp
	FGame/src/Terrain.cpp
Merge branch 'master' into JesseMOE

Conflicts:
	FGame/src/Enemy.cpp
	FGame/src/OnLoop.cpp