Added to the README in another_branch
Merge branch 'master' into another_branch

Conflicts:
	README.md
Merge pull request #2 from sm0svx/another_branch

Added to the README in another_branch