Some previously added photos were replaced...
Merge pull request #43 from rtyqwe/merge-conflict-wrong

Some previously added photos were replaced...