important edits
Merge branch 'master' of https://github.com/nbarker16/nate_training