Materials and textures
fixed merge
changed
Merge branch 'master' of https://github.com/bnbuanes/jordbrr

Conflicts:
	Assets/models.meta
	Assets/models/Materials.meta
	Assets/models/Materials/No Name.mat.meta
	Assets/models/Materials/wire_000065255.mat.meta
	Assets/models/Materials/wire_000187154.mat.meta
	Assets/models/Materials/wire_005063253.mat.meta
	Assets/models/Materials/wire_055048236.mat.meta
	Assets/models/Materials/wire_085028177.mat.meta
	Assets/models/Materials/wire_178010195.mat.meta
	Assets/models/Materials/wire_212000183.mat.meta
	Assets/models/Materials/wire_250126000.mat.meta
	Assets/models/Materials/wire_255000000.mat.meta
	Assets/models/Materials/wire_255176145.mat.meta
	Assets/models/characterRig.mtl.meta
	Assets/models/characterRig.obj.meta