added public files
Merge conflict resolved
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
comment out method as temp fix until we implement enum for user roles
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
change dashboard sidebar link to root path
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
Added categories to nav and changed icons
Added working erb and icon for signout method
added models
Merge pull request #9 from rsoto1/models

Still not sure what the "name" model is for but everything else looks great! I'll merge this and talk to you about it tomorrow.
Removed alert and notices from application.html.erb
Navigation Partials

-	modified:   app/views/layouts/_nav.html.erb
-	modified:   app/views/dashboard/base/index.html.erb
-	new file:   app/views/layouts/_user_nav.html.erb
-	new file:   app/views/layouts/_admin_nav.html.erb

- Cleaned up and corrected spacing and indentation on code.
- Replaced most raw html with .erb code.
- Edited 'signout' under user dropdown menu with .erb so that signout works here.
- Removed .erb signout code at bottom of index page since it works under user.
- Replaced sidebar nav with .erb if/else statement so it renders nav based on user.role?
- Created user_nav partial. Added .erb code and changed icons around.
- Created admin_nav partial. Filled with Dummy data.
Quickfix - extra spacing in .erb code
Admin Nav

-	modified:   app/views/layouts/_admin_nav.html.erb

- Added navigation for admin
- Added icons for each link
generate staff/base controller
set cohorts instance variable for index view
add placeholder text to staff dashboard landing page
add enum for role to user model
generate migration to add name and role fields to user