Ensuring that the code reflects chapter 6 of the Ember.js in Action book
Merge branch 'Ember.js-in-Action-branch' of github.com:joachimhs/EmberFestWebsite into Ember.js-in-Action-branch