revisions to GUI
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2

Conflicts:
	Whale/Assets/Whale.unity