sdasdi

isdjid
Merge commit '63820c49fdd8f981b85d36f120b2a76fe96c0428'

Conflicts:
	bin/boidillism_test00.app/Contents/MacOS/boidillism_test00
	bin/boidillism_test00Debug.app/Contents/Info.plist
	bin/boidillism_test00Debug.app/Contents/MacOS/boidillism_test00Debug
	boidillism_test00.xcodeproj/project.xcworkspace/xcshareddata/boidillism_test00.xccheckout
	boidillism_test00.xcodeproj/project.xcworkspace/xcuserdata/fabricio.xcuserdatad/UserInterfaceState.xcuserstate
	src/Boid.cpp
	src/Boid.h
	src/testApp.cpp