Reset OK
Merge branch 'master' of https://github.com/dmincu/Raspberrula

Conflicts:
	src/joc.py