remove

Conflicts:
	.gitignore