Added model
Merge branch 'master' into noah_develop

Conflicts:
	Assets/6by7.meta