Saving local changes... not sure what they are
Merge branch 'master' of github.com:brennannovak/notes
Made a couple trivial chnages here and there