wip
photo website v2
fix conflict
Merge branch 'master' of https://github.com/gflandre/gflandre.github.com