edited calender css
Merge branch 'master' of https://github.com/elizabrock/coursewareofthefuture
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