Incorporating MP's changes
Trying to figure out how to move forward with commits and not lose files I made in a previous commit.
Merge branch 'master' of github.com:petertbryant/ToxicsRedo