changed a bit
Merge branch 'master' of github.com:strahlex/cnc-machine

Conflicts:
	embedded/src/app.c
	embedded/src/app.h