maywork
maywork
maywork
maywork
maywork
maywork
maywork
working on upvote
Merge branch 'master' of github.com:laxrph10/teamplaylister into route-fix

Conflicts:
	.bundle/config
	db/development.sqlite3
	log/development.log
working on upvote
Merge branch 'master' of github.com:laxrph10/teamplaylister into route-fix
add migration
Merge pull request #50 from laxrph10/route-fix

Route fix