Small changes
Merge branch 'master' of https://github.com/bnbuanes/jordbrr

Conflicts:
	Assets/models/Materials/CMan0002-M3-Body-D.mat.meta
	Assets/models/Materials/CMan0002-M3-Hair-D.mat.meta
	Assets/models/Materials/CMan0002-M3-Head-D.mat.meta
	Assets/models/placeHolderCharacter.FBX.meta
	Assets/models/placeHolderCharacter2.FBX.meta