Added links to midterm 1 to calendar and resources
Merge branch 'master' of github.com:papajohn/61a-fa13-website