stuff
Test
asds
Merge branch 'rails' of https://github.com/jonmathews/zoomout into rails
submit before merge
merged gitignore"

"
lightbox
Merge remote-tracking branch 'origin/rails' into rails
Merge branch 'rails' of github.com:jonmathews/zoomout into develop-chaiy
removed everything form upload/photo
lightbox working
zoom
minor fixes
asdf
asdf