old edits on notebook. Saving to then change the notebook a lot
Merge branch 'master' of github.com:kthyng/time_res