merge conflict

Conflicts:
	.gitignore
gitignore foo