html files
Merge remote-tracking branch 'origin/master'

Conflicts:
	pollerbear/www/views/vote.html