tsdasdasdsdo include in what will be committed)
oines starting
Merge branch 'master' of https://github.com/strahlex/cnc-machine

Conflicts:
	protocol/protocol.tex