no changes
merge conflicts
merge conflict
adds some rspec tests for playlist and user model. playlist controller model says there is no route for playlist#index which is complete BS
merge conflicts, moves  some gems into the development/test group in gemfile