more
Merge branch 'master' of github.com:jarrodmillman/ph240f

* 'master' of github.com:jarrodmillman/ph240f:
  more changes to discussion