dfsdfsd
Merge branch 'matrahlex/cnc-machine

Conflicts:
	embedded/src/Libraries/CFG/includes.h
	embedded/src/app.c