merging repos
Merge branch 'master' of https://github.com/emedine/VisualTouchTherapyJs

Conflicts:
	www/breaker.html
	www/calibrationDisplay.htm
	www/js/parseGraph.js
	www/lib/main.js
	www/pde/calibrationDisplay.pde