first cancan commit
added role to seed data, about to drop database
next cancan commit. About to tidyup navbar branch
Merge branch 'development' of github.com:tmerlet/Photoapp into authorisation
hiding manage site if not an admin, my profile link now routes to users profile rather than all profiles
added some cancan functionality
fixed conflicts with dev
cancan working, may need some tidying
fixed conflicts