doing.... something messy
Merge branch 'master' of https://github.com/bbatarelo/vr-jam

Conflicts:
	Assets/cAssets/chr.meta
	Assets/cAssets/chr/src.meta
	Assets/cAssets/chr/src/img.meta
	Assets/cAssets/chr/src/img/dummy.txt.meta
	Assets/cAssets/chr/src/mat.meta
	Assets/cAssets/chr/src/mat/dummy.txt.meta
	Assets/cAssets/env.meta
	Assets/cAssets/env/src.meta
	Assets/cAssets/env/src/img.meta
	Assets/cAssets/env/src/img/dummy.txt.meta
	Assets/cAssets/env/src/mat.meta
	Assets/cAssets/env/src/mat/dummy.txt.meta
	Assets/cAssets/gui.meta
	Assets/cAssets/gui/src.meta
	Assets/cAssets/gui/src/img.meta
	Assets/cAssets/gui/src/img/dummy.txt.meta
	Assets/cAssets/gui/src/mat.meta
	Assets/cAssets/gui/src/mat/dummy.txt.meta
	Assets/cAssets/sys.meta
	Assets/cAssets/sys/src.meta
	Assets/cAssets/sys/src/img.meta
	Assets/cAssets/sys/src/img/dummy.txt.meta
	Assets/cAssets/sys/src/mat.meta
	Assets/cAssets/sys/src/mat/dummy.txt.meta
	Assets/cAssets/vfx.meta
	Assets/cAssets/vfx/src.meta
	Assets/cAssets/vfx/src/img.meta
	Assets/cAssets/vfx/src/img/dummy.txt.meta
	Assets/cAssets/vfx/src/mat.meta
	Assets/cAssets/vfx/src/mat/dummy.txt.meta