added urs
merging master into this
merging master into this
Merge branch 'master' into add_url_to_flipbks
merging stuffs
Merge pull request #43 from BLNorris/fix_profile

fixed the profile page! except the css is wonky now
Tracking errors
Updated fb pages
Merge branch 'master' into pg_coord
about to merge
merged master in
More profile updates
Working amazon storage woooo. need to test on heroku
Merge branch 'master' into add_url_to_flipbks
Merge pull request #48 from BLNorris/add_url_to_flipbks

IM DOING IT WOOO
made stuff
added lightbox popup thing to main page, needs styling
Merge branch 'master' of github.com:BLNorris/flipbook into fix_profile
added ordering stuff
Merge pull request #49 from BLNorris/fix_shows

Fix shows