put my name in a.txt
Merge branch 'master' of https://github.com/maxwellv/git-demo

Conflicts:
	a.txt