updated john collision's photo
Merge branch 'master' into feature/guides_page