Included d3 gem and added to asset manifest
allow students to view slides on completed courses
Rails ERD pdf creator added with insturctions
Fixed example and instruction
added mailer for when a student submits to an assignment
Created d3 line graph of self reports
Decent exposure (hopefully) only shows user's self reports
went through all of the views and added commentary where I saw fit.
still need to add css styling for form hints
styled legend
Remove unnecessary time travel.
Refactored x axis to use d3.time.scale
fix bug so students can view slides
edited calender css
Merge branch 'master' of https://github.com/elizabrock/coursewareofthefuture
Update tests to use GITHUB_ACCESS_TOKEN.
Merge branch 'master' into ERD

* master:
  Update tests to use GITHUB_ACCESS_TOKEN.
  Remove unnecessary time travel.
  Upgrade to rspec 3.0
  Rename spec_helper to rails_helper
  Bump more gems
  Upgrade to rspec 2.99 and start fixing deprecation warnings.

Conflicts:
	Gemfile.lock
Merge branch 'ERD'

* ERD:
  Fixed example and instruction
  Rails ERD pdf creator added with insturctions
fixed cal width & put back original menu colors
Merge branch 'master' into calenderCSS

* master:
  Update tests to use GITHUB_ACCESS_TOKEN.
  Remove unnecessary time travel.
  Fixed example and instruction
  Rails ERD pdf creator added with insturctions

Conflicts:
	config/application.yml.example
Merge branch 'calenderCSS'

* calenderCSS:
  fixed cal width & put back original menu colors
  edited calender css