Link midterm 1 conflict form
Merge branch 'master' of github.com:papajohn/61a-fa13-website