Merge branch 'master' of github.com:laxrph10/teamplaylister
Small changes to user css
Updates to user css
Fixed merge conflict in user css and dev log
Merge branch 'user_view'
play method exists, not implemented
Merge branch 'play_method2'
still with the db merge thing
updated buttons on playlist show
pushing latest changes to party view
fixed search results display radio button and bullet points
Merge pull request #62 from laxrph10/rob_aug_4

fixed search results display radio button and bullet points
fixed text message
we now have most of the routes working. also a 'play' button which appears on the party's show page, but only for the owner of the party. button currently passes a param called 'play_party' but doesn't do anything else
some work done on the play button, it still doesn't entirely work, but we're close\!
Made changes to form
Added background and required code input, minimum 5 characters
Fixed merge conflict with ultimate