nope
Merge branch 'master' of https://github.com/CICM/HoaLibrary

Conflicts:
	Max3D/HoaRotate/hoa.rotate3D~.xcodeproj/project.xcworkspace/xcshareddata/hoa.rotate3D~.xccheckout