Edit gitignore
Merge branch 'master' of github.com:ember-admin/ember-admin.js