Not working yet
Merge branch 'master' of https://github.com/rstolyarov/arm_control

Conflicts:
	arm_display.py
Committing before merge
Merge branch 'master' of https://github.com/rstolyarov/arm_control

Conflicts:
	definitions.py