added urs
merging master into this
merging master into this
Merge branch 'master' into add_url_to_flipbks
merging stuffs
about to merge
merged master in
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