Added intersection code for spheres
trying to test for generate ray
Merge branch 'master' of https://github.com/john6/cs184

Conflicts:
Main
MainWithWorkingCam.cpp
Working on collisions