gitignore add
Merge branch 'master' of https://github.com/monbro/opensemanticapi

Conflicts:
	.gitignore