Ignore project
Merged ingnore file
Fixed merge conflict
Merge branch 'master' into auto-annotations

Conflicts:
	.gitignore