Edit README
Merge branch 'master' of https://github.com/netdis/git-test

Conflicts:
	README.txt