cause source tree is dumb
Merge branch 'master' of https://github.com/Robmaister/GameDev1Project3

Conflicts:
	Assets/Props/Chest.fbx.meta