commit
Merge branch 'master' of https://github.com/davidgithub1980/test

Conflicts:
	text.txt