teaching
Merge branch 'master' of https://github.com/mikss/mikss.github.io

Conflicts:
	teaching/index.html