prepare merge upstream
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
Merge pull request #26 from raderj89/master

fix up model spec concert_song_spec
Merge pull request #27 from raderj89/master

take out line checking if musicbrainz result is string
model/concert_song_spec all 7 exmaples all passed
fix merge conflict
Merge pull request #28 from tihuan/fix/model/concert_song_spec

Fix/model/concert song spec
When viewing concert_page if user has already added concert to thier
  profile, it will say 'I attended this concert' otherwise there will
  be a button present to add the concert to your profile.
fix conflict in factories
Merge branch 'Onaracs-master'
Update README.md
Update README.md
Update README.md
add 3 examples. All pass.
Merge pull request #30 from tihuan/fix/controller/user_spec

add 3 examples. All pass.