something working? in between
some merge
ignore __pycache__
Merge branch 'master' of https://github.com/sonopard/PowerCounter

Conflicts:
	raspi/src/ppm.py