Paul commit second try
Merge branch 'master' of https://github.com/mbgtde/TestAutomation

Conflicts:
	aaa.txt