Submission works
Merge branch 'master' of github.com:sociam/lying-survey

Conflicts:
	www/js/index.js