fixed merge conflict and added some documentation
fixed conflict after merge
fixed conflict after merge
Merge branch 'master' of https://github.com/aneeta-lutfee/ray-tracer
fixed check issue with shpere intersection