Link midterm1 info page
Merge branch 'master' of github.com:papajohn/61a-fa13-website

Conflicts:
	index.html