improving cancan
bug fix for pics on heroku
Merge branch 'development' of github.com:tmerlet/Photoapp into authorisation
adding in comments, and a commented out section on app.html
fixed conflict