Changed Goal
Merge pull request #6 from kedromelon/Matt'sBranch

Changed Goal
Merge branch 'master' into noah_develop

Conflicts:
	Assets/Scenes/Showcase-3.unity