Final working copy of website (hopefully)
Merge branch 'master' into static_semesters