Added consent form, option to view and erase your data, toggles for the social + time conditions, and some other crap.
Merge branch 'master' of https://github.com/akiyantseva/cs105

Conflicts:
	js/logic.js
	survey.html