commit merge conflict maker
Merge pull request #1 from paulcpederson/master

changed readme
exploreing conflicts
Merge pull request #2 from nikolaswise/master

pr
Merge pull request #1 from acetate-test/master

update my fork