More shapes

Added more shapes
Same as before
Merge branch 'master' into shapes
Merge branch 'shapes'

Conflicts:

ciel_etoile_0_1/bin/ciel_etoile_0_1Debug.app/Contents/MacOS/ciel_etoile_
0_1Debug

ciel_etoile_0_1/ciel_etoile_0_1.xcodeproj/project.xcworkspace/xcsharedda
ta/ciel_etoile_0_1.xccheckout

ciel_etoile_0_1/ciel_etoile_0_1.xcodeproj/project.xcworkspace/xcuserdata
/gabrielgianordoli.xcuserdatad/UserInterfaceState.xcuserstate
	ciel_etoile_0_1/src/testApp.cpp