Merge branch 'master' of https://github.com/nasser/dtplayfulsystems
3.5 HW
Updates
Updates
Updates to HW and Midterm
Merge branch 'master' of git://github.com/gpatacsil/dtplayfulsystems into gpatacsil-master

Conflicts:
	nasser/betweenZeroAndOneMovingAndScaling/bin/betweenZeroAndOneMovingAndScalingDebug.app/Contents/MacOS/betweenZeroAndOneMovingAndScalingDebug
	nasser/betweenZeroAndOneShaping/bin/betweenZeroAndOneShapingDebug.app/Contents/MacOS/betweenZeroAndOneShapingDebug
Merge branch 'master' of https://github.com/nasser/dtplayfulsystems

Conflicts:
	Gabi Patacsil/shapeFunctionHW_0226/bin/shapeFunctionHW_0226Debug.app/Contents/MacOS/shapeFunctionHW_0226Debug