Merge branch 'master' of https://github.com/srli/NeatoController into averages

Conflicts:
	controller.py
merge
averages background across 20 frames