Final version for book
Merge branch 'master' of https://github.com/emberjsbook/rocknrollcall

Conflicts:
	app/templates/artist.hbs
	app/templates/song.hbs