Merge branch 'master' of https://github.com/Danihelsan/ImageSearcher

Conflicts:
	.gitignore