some edits
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:team-saga/playlister-rb-unit-1
fixed conflicts