bx list
Comportamientos listos

Merge branch 'master' of https://github.com/AndresNebel/Proyecto-de-Grado

Conflicts:
	Blockly/apps/yatay/css/tablet.css
	Blockly/apps/yatay/tablet.html