sdsada
Merge branch 'master' of https://github.com/strahlex/cnc-machine

Conflicts:
	protocol/protocol.log
	protocol/protocol.pdf
sdasd