minor
Merge branch 'master' of https://github.com/FIC/Bezier-Curve-Interaction into develop
trying to reset commit
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	index.html
	js/bcmain.js
	js/main.js
	js/main.js.conflict
Merge branch 'develop'
code cleanup
update index to match dev
update main.css to match develop