no se
Merge branch 'master' of https://github.com/antoniog/Python

Conflicts:
	countermobi/micounter.py
	countermobi/micounter.sqlite