fixed bug, float photo
Merge branch 'master' into gh-pages