changes
Merge branch 'master' of https://github.com/datakid/opencount

Conflicts:
	opencount.py
latest updates