Merge pull request #1 from stumpc5/master

let's see what happens here
adding some junk...
Merge pull request #17 from chrisjamesberg/master

Trying to make a change