git rebase --continue
modified:   README.md
modified:   app/.DS_Store
modified:   app/assets/.DS_Store
renamed:    app/assets/face.jpg -> app/assets/images/face.jpg
modified:   app/assets/javascripts/views/card.js
modified:   app/assets/stylesheets/card.css.scss
modified:   app/assets/templates/card.jst.ejs