Player movement finished. Don't worry about the deleted files, I just moved them to a folder (Nathan v 1.4 ish)
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2

Conflicts:
	Whale/Assets/Whale.unity