git branch edis
Merge branch 'master' into test

Conflicts:
	testGit.txt