Carlos helped optimize the db queries for merit highscores
Merit

- Carlos Merit leaderboard per cohort magic!
fixed merge conflicts
Resolved merge conflicts
Resolved merge conflicts
Resolved merge conflicts
Merit

- Reinstall merit gem.
- Added all migrations.
- Added has_merit to user model.
Merit

- Added merit points.
- Adds 5 points for making a comment.
- Removes 10 points if staff feels they need to delete inappropriate comments.
- Adds 10 points for creating a new conversation.
- Removes 10 points if staff feels they need to delete inappropriate conversations.
- Adds 25 points for submitting and assignment.
- Adds 25 points for staff accepting an assignment.
- Adds 100 points for linking github profile to user profile.
Merit

- Added Categories for different points assignments.
- Added a summary of each category on dashboard.
Merge Conflicts

- Added Rocio and Alex's changes from origin master.
- Handled merge conflicts.
Added Ambry gem to fix merit
Merit

- Set before_action in BaseController for leaderboards method.
- Took out ordered list on leaderboard page, wasnt displaying correctly.
Merit

- Changed the dashboard card to Score Summary.
- Added each points category to the card, a total points and the link to the leaderboard.
Fix merit add points call

Changed line 127 for you.
From: `current_user.add_points(100)`
To: `self.add_points(100)`
Merge pull request #111 from cmckee-dev/feature/merit

Ninja Sawce!