merge
Merge branch 'master' of https://github.com/jenniferdr/raspberryROS

Conflicts:
	src/AprendizajeQ.cpp
	src/main.cpp
	src/makefile
	src/tabla.txt
Merge branch 'master' of https://github.com/jenniferdr/raspberryROS
supuestamento lo del arco listo