Massive commit with so much stuff
Merge branch 'prototype3' of https://github.com/CalvinFernandez/Speechero
added back stuff we lost :(
let's try that again
Updated the testing folder with the latest code in the master branch. Going to add the same folder to the prototype3 branch soon
Working for user testing. Integrated old avatar into new UI
Working?
Merge branch 'prototype3' of github.com:CalvinFernandez/Speechero into prototype4

Conflicts:
	Prototype3/gesturesInstructions.html
Cleaned up prototype4
fixed conflicts
Merge branch 'prototype4' of https://github.com/CalvinFernandez/Speechero into prototype4