reset
Merge branch 'master' of https://github.com/modibixa/Test1

Conflicts:
	aaa.txt