Terrain Sample + Camera Changes
fix branch failure (hopefully)
Merge branch 'master' of https://github.com/weaverreaper/Southfall2

Conflicts:
	Southfall3D.suo