Comment teaching ma
Merge branch 'master' of github.com:bjornmeansbear/MFAthesis2014

Conflicts:
	index.html