modified:   Process Book.ipynb
Merge branch 'master' of https://github.com/johnsturm/cs109 into john

Conflicts:
	Process Book.ipynb

Tried to get everything to work and fit together -- John and my parts are in, but is everyone else's?
Merge pull request #12 from atucker/john

Tried to integrate the code