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
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