First
Merge branch 'master' of https://github.com/bphermansson/AutoSpot

Conflicts:
	AutoSpot.py