New picture
Merge branch 'master' of github.com:pote/conference-resources