add computer setup
Merge branch 'master' of https://github.com/macmanes/MacManes_Lab_Notebook

Conflicts:
	Matt/Maker Stuff/Maker Notes.md.plist
	Matt/Maker Stuff/Maker on workstation.md.plist
	Matt/Maker Stuff/Simulating drift.md.plist