I hope this only applies to the server
Merge pull request #9 from joostdevries/ember-cli-is-awesome

I hope this only applies to the server