Add code from march
Add attractor and vectorOfPoints code
Merge remote-tracking branch 'origin/master'

Conflicts:
	nasser/betweenZeroAndOneShaping/src/testApp.cpp