Merge branch 'master' of github.com:LDreptate/test

Conflicts:
	a.txt
sd:wq
Merge branch 'master' of github.com:LDreptate/test

Conflicts:
	a.txt