added cancan functionality
quick fix
updated cancan.  works now
fixed gemfile.lock merge conflict
Merge branch 'cancan' into development
renamed welcome controller to linkedin, and changed redirect route to resovision show page
trying to fix ziggeo
fixed resovision edit & show views
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
fixed end date issue
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
pulled Liza's changes
pulled Liza's changes
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
committing changes
Merge branch 'hotfix_edit_view' into development
troubleshotting Liza's merge
fixed CanCan bug
Merge branch 'development' of github.com:alevsxm/Team-Doge into development