updated gitignore
fixed merge conflict

Conflicts:
	.gitignore