first try
Merge branch 'master' of github.com:aa989190f363e46d/tlc-spots-detector

Conflicts:
	.gitignore