updated readme
Merge branch 'refs/heads/test' into prod

Conflicts:
	README.md
Merge branch 'refs/heads/test' into prod
Merge branch 'refs/heads/test' into prod
Merge branch 'refs/heads/test' into prod
Merge branch 'test' into prod

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'test' into prod
Merge branch 'test' into prod
Merge branch 'master' into prod
Merge branch 'test' into prod
Merge branch 'test' into prod
Merge branch 'test' into prod
d