git ignore
init
Merge branch 'master'

Conflicts:
	.gitignore
git ignore