Commit #100 User1
Merge branch 'master' of https://github.com/djsedulous/test

Conflicts:
	1.txt