Some changes I don't know about
Fixed merge conflict in photos.html