this is message :x
X

Merge branch 'master' of https://github.com/kadoshms/myproject

Conflicts:
	.gitignore