a
Merge branch 'master' of https://github.com/RRozza/Simulador

Conflicts:
	Proyecto.sdf
	Proyecto.v11.suo
a
Merge branch 'master' of https://github.com/RRozza/Simulador