Added test for update self report; my heart led me to refactor Eliza's
tests
test on update self report fails as expected
added 'edit' to completed report; set routes in routes.rb
edit functions but uses separate view
preparing to implement ajax for update self report
merge commit
Merge branch 'update_self_report' of https://github.com/elizabrock/coursewareofthefuture into feature
Reorder completed form caledar display/ edit self report
Update Self-Reports via Ajax
Edit forms repopulate with curent data
Edit Self Report and Users Profile Spec
Remove id from self report params
Change self_reports resource to use 'except' rather than 'only'
Merge branch 'master' into update_self_report

* master: (52 commits)
  Added unit test for covered materials
  Updated self_report validation Fabricators/tests
  :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.
  Self Report Validation and Form Alerts
  Self Report Validations
  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
  Added covered materials validation
  non-function test to compare original image file with response through github
  ...

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/self_reports_controller.rb
	app/views/self_reports/show.js.erb
	spec/features/student_self_report_spec.rb
Small refactor of view rendering
Merge branch 'master' into update_self_report

* master: (45 commits)
  Fix: Only one event per day shows up on the class calendar
  Student marks materials as read.
  Move _covered_materials into appropriate partial location.
  Rename Material#path to Material#directory, in order to clarify the meaning of Material#fullpath
  Rename redundant "is_x?" methods
  Refactor pretty_path and edit_url into view helper.
  Refine class method names.
  Complete rewrite of Material class, mostly following original API.
  spelling correction
  updates self_report fabricator
  adds quip
  adds custom validation for total hours reported, adds specs for validation
  Very minimal refactoring of Material class.
  mitch helped me out a little with the icon
  renamed variable to include both possible values
  added if to account for todays self_rep in on going courses
  adding counter for self reports due
  Backfill unit tests for Material
  Add spec so that Materials shows up in coverage report.
  Refine simplecov setup
  ...

Conflicts:
	app/controllers/self_reports_controller.rb
	app/helpers/events_helper.rb
	config/routes.rb
Fixup: Self report error messaging.
Merge branch 'update_self_report'

* update_self_report:
  Fixup: Self report error messaging.
  Small refactor of view rendering
  Change self_reports resource to use 'except' rather than 'only'
  Remove id from self report params
  Edit Self Report and Users Profile Spec
  Edit forms repopulate with curent data
  Update Self-Reports via Ajax
  Reorder completed form caledar display/ edit self report
  merge commit
  preparing to implement ajax for update self report
  edit functions but uses separate view
  added 'edit' to completed report; set routes in routes.rb
  test on update self report fails as expected
  Added test for update self report; my heart led me to refactor Eliza's tests