タイムラインに投票を表示する記載を追加
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/timeline.js
	app/views/timeline/init.html.erb