Merge branch 'master' of https://github.com/profwacko/esc-website

Conflicts:
	departments.html
Merge branch 'master' of https://github.com/profwacko/esc-website