added role column and methods in user model
fixed merge conflict in app controller
removed unneeded spec file
added basic cancan functionality for logged in vs not