Updated
Merge branch 'master' of github.com:bencooling/bec-notes