Update Schema
Resolved Merge Conflicts
Update Schema
Added schema.rb to git ignore
Merit

- Added merit gem to gemfile.
Merit

- Ran bundle install.
- Ran rails g merit:install to create all migrations.
- Ran rails g merit user to associate merit to users model.
- Ran rake db:migrate
Merit

- Added merit_scores_override.rb to config/initializers to add method for highscores.
Merit

- Added current user score summary to top navbar.
adds schema.rb to ignore file
Resolved Merge Conflicts
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
Fix Postgresql db

- Deleted migrations
- Droped and created db, ran migrations.
Resolved Merge Conflicts

- Merging cmckee/Merit branch into a current branch named feature/test.
Ran rake db:migrate to add Merit migrations
Added secrets.yml, .rspec, .ruby-gemset and gemlock to .gitignore file
Git Ignore

- Added secrets.yml, .rspec, .ruby-gemset and gemlock to .gitignore file
Resolved merge conflicts
Discussion Board

- Generated Board scaffold, title:string
- Generated Conversation scaffold, board:references user:references title:string last_commenter_id:integer last_comment_at:datetime
- Generated Comment scaffold, conversation:references user:references body:text
- Added basic routes, /boards
Discussion Board Models

- Added models logic.
- Added has_many and belongs_to associations.
- Added validations.
- Added has_many associations to user model.
Discussion Board Errors

- Fixed typo
- Added schema_plus to gemfile for foregin key support.