added a note to Katie @kjones13
messing things up
Merge branch 'master' of https://github.com/scelmendorf/gittest