edited README.md
Merge branch 'master' of https://github.com/YingtingXiao/Project1-RayTracer

Conflicts:
	PROJ1_WIN/565Raytracer.sdf
	PROJ1_WIN/565Raytracer.v11.suo
	PROJ1_WIN/565Raytracer/Win32/Release (v5.5)/raytraceKernel.cu.obj
	PROJ1_WIN/565Raytracer/vc110.pdb