mwest adding his notes
Merge branch 'master' of github.com:cross311/conferences