changes
Merge pull request #1 from bishopj15/newbranch

changes