cleaning up, getting ready for midterm
Merge remote-tracking branch 'origin/master'