input file
Merge branch 'master' of github.com:mayank127/raytracer

Conflicts:
	main.cpp
Merge branch 'master' of github.com:mayank127/raytracer
affine transformation done