Made the nav and sidebar visible on the edit users page
merge conflict
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Student-Portal-Capstone
Pull
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Student-Portal-Capstone
Pull
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Student-Portal-Capstone
Pull
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Student-Portal-Capstone
Pull
Switched buttons back and removed container
Merge pull request #40 from alexand3rsc0tt/buttons

WORKS
Merge pull request #41 from cmckee-dev/develop

Develop
Merit

- Added Merit gem
- Ran migrations for merit
- Tested points system to see if works
Merge branch 'master' into develop
Take two with the resources page
Merge pull request #43 from alexand3rsc0tt/static

Take two with the resources page
Merit

- Removed scores widget from dashboard.
- Added a bootstrap well on user profiles.
- Added icons and score display on user profiles.
- Added merit method override for displaying high scores.
UI tweak

- Added Score display to top nav
- Removed Project Manager from side nav
Merit

- Added High Scores leaderboard to widget on dashboard.
Merge branch 'master' into develop