Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/polls/index.html.erb
Merge conflict
Merge
Added more css
merge