Update README.md
Merge branch 'master' into conflict-1

Conflicts:
	README.md
Merge pull request #11 from cbuckey-uda/conflict-1

Update README.md