added a table to the polls index view
made a very crude poll show view
merge
Merge remote-tracking branch 'upstream/master'

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