Merge pull request #47 from laxrph10/route-fix

fixed routes
maywork
added vote table for voter verification
Merge pull request #48 from laxrph10/vote_feature

added vote table for voter verification
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
create vote model
Merge pull request #49 from laxrph10/vote_feature

create vote model
Merge branch 'master' of github.com:laxrph10/teamplaylister into route-fix
add migration