commiting models and stuff
Merge branch 'master' into Dylan

Conflicts:
	Assets/models/Beached Whale.ma.meta
	Assets/models/Walrus.ma.meta
Merge pull request #2 from kedromelon/Dylan

Dylan