slow steady progress
amazing
Merge branch 'upvote-feature'
Merge branch 'master' of github.com:laxrph10/teamplaylister

Conflicts:
	db/development.sqlite3
resolving merge conflict