Merge pull request #25 from tufts-LPC/production

merge production into master
added my notes
maestro3

in progress
Maestro update
Merge branch 'master' into JM_ChuckReneovation