move file
Merge branch 'master' of github.com:blackbing/wedding-slides

Conflicts:
        app/img/photos/54.jpg