Update the teaching page.
Merge branch 'master' of github.com:JuliaLang/julialang.github.com

Conflicts:
	teaching/index.md