updated some stuff
Updating conflicts

Conflicts:
	client/views/polling/polling.js
	collections/responses.js