added forem / will_paginate to gemfile and bundle
set up install init

rails g forem:install
rails g forem:views
deleted unused modified layout to use main_app
deleted unused modified layout to use main_app
Merge branch 'forums' of https://github.com/elizabrock/coursewareofthefuture into forums

Conflicts:
	app/views/layouts/application.html.haml
tests for everything important in Forem
changes to reflect comments on github
added ENV variable DEFAULT_FROM and changed uses

application.rb
initialzers/forem.rb
Merge branch 'master' into forums

* master: (59 commits)
  actually fixed the tests this time
  changed content of expected body of email in test to make it pass
  slightly prettier version of the same
  changed the after_create in the user model to a before_create
  Fix image urls in mailer.
  image_path attempted implemenation
  added a test specifically for the automatic instructor functionality
  updated outlying tests to handle the first user being an instructor
  Added unit test for covered materials
  modified test support files to mostly handle the first user being an instructor
  added a check for the first user in the user model
  Updated self_report validation Fabricators/tests
  beautified self-report email
  :zap::octopus:self_report spec tests date uniqueness validation:zap:
  Adjust image tests to test response bodies.
  Switch to using application.travis.yml for travis.
  Rerecord cassettes.
  added tests to ensure form hints are showing up on the page
  went through all of the views and added commentary where I saw fit. still need to add css styling for form hints
  Refactor tests and rename mailer.
  ...

Conflicts:
	Gemfile.lock
	app/models/user.rb
Merge branch 'forums'

* forums:
  added ENV variable DEFAULT_FROM and changed uses
  changes to reflect comments on github
  tests for everything important in Forem
  deleted unused modified layout to use main_app
  deleted unused modified layout to use main_app
  rails g forem:views
  set up install init
  added forem / will_paginate to gemfile and bundle