albums page IP
Merge branch 'master' of github.com:BrandonWLee/wisdomsun
working photos and albums, without popup for indiv photos
working photos and albums without popup for indiv photos, resolved merge conflict in schema.rb