Merge
Merge branch 'master' of https://github.com/fad4470/SpaceJam.git
Merge branch 'master' of https://github.com/fad4470/SpaceJam.git
I dont know what Im doing!
Merge branch 'master' of https://github.com/fad4470/SpaceJam.git

Conflicts:
	Assets/New Cubemap 1.cubemap.meta
	Assets/New Cubemap 2.cubemap.meta
	Assets/New Cubemap.cubemap.meta
	Assets/Standard Assets.meta