button display changed
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

Conflicts:
	db/migrate/20141218002109_add_score_to_votes.rb