server changes
Merge branch 'master' of https://github.com/muditshukla2/jodibreaker

Conflicts:
	jodibreakerapp/templates/vote.html