synching some old stuff
Merge branch 'master' of github.com:moops/photo