[update]

ordenes de entrada funcionando
Merge branch 'master' of https://github.com/raiot/bus-united

Conflicts:
	.gitignore