some changes
Merge branch 'rails' of https://github.com/jonmathews/zoomout into rails
photo viewer mark 1
merge
Merge remote-tracking branch 'origin/rails' into rails