manual merge

Conflicts:
	.gitignore