Merge pull request #2 from nikolaswise/master

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

update my fork
Update README.md
Merge pull request #3 from paulcpederson/master

asdf
Merge branch 'master' of https://github.com/acetate-test/test-repository
Update README.md
Merge pull request #4 from paulcpederson/master

Update README.md
ruin a thing
what merge conflict?