last commit or hopefully the last commit
Merge branch 'master' of https://github.com/MaybeSacred/cs4911-Game-of-Dragons

Conflicts:
	Assets/Models/halberd.fbx.meta
	Assets/Scene0.unity