maintenance
Merge branch 'master' of https://github.com/awhan/notes

Conflicts:
	fonts/links.rst
rst better than md