changed readme
Merge pull request #1 from paulcpederson/master

changed readme
exploreing conflicts