updated master notebook
Merge pull request #13 from tebarkley/combined-notebook

updated master notebook