Skybox implemented
Merge branch 'master' of https://github.com/JustinBis/CS123-Final

Conflicts:
	camera.cpp
	view.cpp