Merge remote-tracking branch 'origin/Adam' into Jody

Conflicts:
	DDD/Assets/New Terrain.asset
Merge remote-tracking branch 'origin/Adam' into Jody
hooked up the InputController
Merge remote-tracking branch 'origin/Jody' into Adam

Conflicts:
	DDD/Assets/Scenes/Test.unity
	DDD/DDD.userprefs