periodic update
Merge branch 'master' of github.com:sinisterdexter/grad-school-notes

Conflicts:
	Navin rotation/.Rhistory