First  commit
First  commit wer
Merge origin/master

Conflicts:
	.gitignore