:bird: created a prereading model and controller
Working progress on prerequsits
Rename Prereading to Prerequisite
Staged tests for assignment prerequisites
Merge branch 'master' into prereading

* master: (42 commits)
  :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.
  Remove final references to cucumber.
  Adjust quoting in .travis.yml
  No more multiple reports for one date
  :zap::octopus:Line graph is formatted!:octopus::zap:
  cleanest version of milestone_submission_spec, still failing
  changed btns back to crazy shape, etc..
  added tests to ensure form hints are showing up on the page
  non-function test to compare original image file with response through github
  moved tests over to milestone submission model spec; the test for the URL is currently failing
  Travis fixes, now including the correct arguments and command!
  Update .travis.yml to add GITHUB_ACCESS_TOKEN to build
  Fix intermittent test failure when current_user.id is equal to course.id
  clean up student views slide integration test
  ...

Conflicts:
	app/views/assignments/new.html.haml
	spec/features/instructor_chooses_assignments_from_github_spec.rb
Updated failing tests.
pulled the chenages on master
commiting changes from prereading origin
:banana: this are the changes for the prerequsites but there is something is not working
Merge branch 'master' into prereading

* master: (78 commits)
  Update code climate repo token
  Users can be marked as observers that don't receive email messages.
  Rename spec file
  IRC widget embed
  Slides can now be viewed on material that hasn't yet been covered.
  Improve icons and materials structure.
  Update README
  Show full path for materials that haven't been written yet.
  Switch google fonts to https.
  Refactor: Material#find, now with less n^3
  Switch New Relic accounts
  Rerecord vcr cassettes
  Bump gems.
  Setup newrelic
  Increase Unicorn timeout
  Fix: missing self report totals
  Fix discrepancies around self report counts.
  Clean up materials page.
  Integrate new user interface elements into the overall design.
  Fixup: Self report error messaging.
  ...

Conflicts:
	app/models/assignment.rb
	app/views/assignments/show.html.haml
	db/structure.sql
	spec/features/instructor_chooses_assignments_from_github_spec.rb
	spec/models/material_spec.rb
	spec/support/features/materials_tree_matchers.rb
Refactor shared material functionality into the Materiable module.
Refactor out Material#link
Complete implementation of assignment prerequisites
Delete unnecessary .keep files.
Merge branch 'prereading'

* prereading:
  Delete unnecessary .keep files.
  Complete implementation of assignment prerequisites
  Refactor out Material#link
  Refactor shared material functionality into the Materiable module.
  :banana: this are the changes for the prerequsites but there is something is not working
  Updated failing tests.
  Staged tests for assignment prerequisites
  Rename Prereading to Prerequisite
  Working progress on prerequsits
  :bird: created a prereading model and controller