.iml ignored file
OK
Merge remote branch 'origin/master'

Conflicts:
	.gitignore
OK
OK