Un comentario en la segunda linea.
Merge branch 'master' of https://github.com/fperezplain/CalculatorGit

Conflicts:
	CalculatorEstandar.cs