updating README.md
Merge branch 'master' of github.com:pcpratts/rootbeer1

Conflicts:
	README.md
updating README.md
Merge branch 'master' of github.com:pcpratts/rootbeer1 into develop