app is now user-aware (login and logout) and somewhat LDAP aware
Merge branch 'master' of https://github.com/YaleSTC/doris
ran bundle update
added users to edit project page, show projects and users associated with labs
added CanCan and Rolify, set access controls on undergrads, pis, and admins
fixed merge conflict
user, project partials
merged user model
enabled user to switch his status between admin/pi/undergrad
removed unnecessary code from user index
fixed merge conflict
added new project link to lab page
hid destroy and edit buttons for users and projects for those who shouldnt be able to see them. also have user names show up in projects.
merged conflicts
blah
tried to fix the redirect issue for first time users
Merge branch 'master' of https://github.com/YaleSTC/doris
another attempt to fix redirect issue
Merge branch 'master' of https://github.com/YaleSTC/doris
ANOTHER attempt to fix the redirect issue