git test
Merge branch 'master' of github.com:qfma/pibell

Conflicts:
	pibell/sim900.py