agregado clases
Merge branch 'master' of github.com:hezuo/calculator

Conflicts:
	.gitignore
	src/com/ingeniadev/app/calculator/Calculator.java