testing branch's working
part 1 of authorization Cancan
authorization, changing the role from guest to user upon save
changes to views
Merge branch 'master' of github.com:bgkennedy2000/cheerup_app
Merge branch 'authorisation'
Merge branch 'master' of github.com:bgkennedy2000/cheerup_app