merge
Merge branch 'master' of github.com:hkust-psan1/FYP
淡淡的忧伤
Merge branch 'master' of github.com:hkust-psan1/FYP

Conflicts:
	FYP/parser.cpp
Merge branch 'master' of github.com:hkust-psan1/FYP

Conflicts:
	FYP/FYP.xcodeproj/project.xcworkspace/xcuserdata/guanlunzhao.xcuserdatad/UserInterfaceState.xcuserstate
can now change viewport
Merge pull request #17 from guanlun/master

can now change viewport
cleaning code
merging
Merge branch 'master' of github.com:liligeng111/FYP

Conflicts:
	FYP/RayTracer.cpp
Merge pull request #18 from guanlun/master

merge
what have I done