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
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
removed an extra 'end' from the party show page
cleaning up a little after that last merge
front page party code input works now
some small fires put out
solved a problem, created another one. so it goes.
cleaned up stray bindings
preparing for heroku push
preparing for heroku push
whatisthisidonteven
merge conflicts