Implemented ray collisions
Merge branch 'master' of https://github.com/g0tsimid/csc418-a3