Bad update to style.css
Merge remote-tracking branch 'origin'
Merge branch 'master' of github.com:mradamh/ember-address-book
Merge branch 'master' of github.com:mradamh/ember-address-book
Merge branch 'master' of github.com:mradamh/ember-address-book
Merge branch 'master' of github.com:mradamh/ember-address-book
Added a delete button from the view rather than edit
Merge branch 'dmitrydeletebutton' of github.com:mradamh/ember-address-book

Conflicts:
	js/router.js