commit machine
Merge branch 'dev' of https://github.com/bloodmaker/Pinoccio.git into
dev

Conflicts:
	machine.c
Merge branch 'dev' of https://github.com/bloodmaker/Pinoccio.git into
dev

Conflicts:
	machine.c