fixing build

Conflicts:
	.gitignore