Update README.md

Still in progress
Update README.md

Done
Fixed post-pull conflict
Merge branch 'awashbrook-master'