A few modifications to photos. Added ampersand photo
fix merge conflict