remove photo from last two
Merge branch 'master' into gh-pages