magic!
Merge branch 'origin' of github.com:obviousjim/OpheliaAlignments

Conflicts:
	POOL_33/compositions/comp1_eyeZoomFlipTest/SpecularY.xml
	POOL_33/compositions/comp1_eyeZoomFlipTest/camera_position.xml
	POOL_33/compositions/comp1_eyeZoomFlipTest/timeline0_Specular_Light_trackPositions.xml