survey textbox/year questions
Merge branch 'master' of https://github.com/wellincall/project-happiness

Conflicts:
	project_happiness/templates/private_area/answerstable.html