Updating gitignore
Resolving some stupid conflict in gitignore

Conflicts:
	.gitignore