added index d3 and show only on show-page
Merge branch 'app_index'

Conflicts:
	app/assets/javascripts/show.js.coffee
Merge branch 'master' of https://github.com/milafrerichs/votenow