Update README.md
Merge branch 'master' into diff-format-test

Conflicts:
	README.md
Merge pull request #12 from cbuckey-uda/diff-format-test

Update README.md