opiti
comp
Merge branch 'master' of github.com:tonyhawz/mt-robotica

Conflicts:
	code/compCargarLata.py
buenooo