Finalized

We finished our final first prototype.
Merge remote-tracking branch 'origin/master'

Conflicts:
	HairDoApp.html
	HairDoJS.js