housekeeping on proclus
# Please enter the commit message for your changes. Lines starting
housekeeping more
Merge branch 'master' of https://github.com/ydnality/Scene2D

Conflicts:
	pbrtHome.m
	scripts/pbrtFiles/chromaticAberration.pbrt
more house keeping
 Please enter the commit message for your changes. Lines starting