mods
Merge branch 'master' of https://github.com/rpietro/rpietro.github.io

Conflicts:
	_drafts/course_frameworks.md