Merge branch 'votes'

Conflicts:
	README.md
	app/views/albums/index.html.erb
Merge branch 'master' of github.com:trvrfrd/trvrgur

Conflicts:
	README.md