to see commit msg!
Merge branch 'master' of https://github.com/aqaya/myrepo

Conflicts:
	test1