commenting out cancan so I can play on the train without having to bundle, migrating dbs
uncommenting gems now the internet is back, adding debuging gems
adding some notes
Merge branch 'master' of git://github.com/emmaviolet/photo_sharing_app