white space change
Test of feature addition for git-flow
Merge branch 'develop'

Conflicts:
	javascript/SpiroGraph.js