Some changes
Merge branch 'master' of https://github.com/JohnDeCorato/CS6650FinalProject

Conflicts:
	Part1/src/const.h
	Part1/src/kernel.cu
Small changes as to how things work.
Fixed some issues with matrix and made the matrix vs naive togglable.
Merge branch 'master' of https://github.com/JohnDeCorato/CS6650FinalProject

Conflicts:
	Part1/PROJ_WIN/Project3/shaders/planetVS.glsl
	Part1/src/kernel.cu