Revert "gitignore"

This reverts commit 6202a4b166ad41f6dbfd3bd1987605754c42d16c.
conflicts .gitignore

Conflicts:
	.gitignore