Wizards and shit maaaannnnn
Merge branch 'master' of https://github.com/jacobtexel/494Project3

Conflicts:
	Assets/A-Lab Software Skyboxes (18) Vol 1 (FREE)/Skybox13.mat