edit readme locally
Merge branch 'master' of https://github.com/johndbritton/project1