looked at whale :p
Merge branch 'master' of https://github.com/DJTedMoney/Milestone2

Conflicts:
	Whale/ProjectSettings/ProjectSettings.asset
	Whale/ProjectSettings/QualitySettings.asset
Whale game unity vs. 4.1.2