new file:   mergc.txt
Merge branch 'master' of github.com:augeste/mycode

Conflicts:
	mergc.txt