Add something to README.md
Merge branch 'master' of github.com:ertemplin/git-test

Conflicts:
	README.md