notes
Merge branch 'master' of https://github.com/emberjsbook/rocknrollcall

Conflicts:
	README.md