Merge branches 'deploy' and 'master' of github.com:vened/photogallery
 add text
 add text
add photos