Updated some things...
Merge branch 'master' of https://github.com/SeanRobinson159/Notebook.git