made a very mature change
fixing merge conflict maybe
Merge pull request #3 from SStrausman/smallconflict

made a very mature change