3/26/14 AM

3/26/14 AM
Merge branch 'kbn' of https://github.com/emmette/Notebooks into kbn

Conflicts:
	Kelsey's notebook.ipynb