still going
Merge branch 'master' of https://github.com/roguephysicist/shg-notes

Conflicts:
	my_derivation.pdf