calculadora sin logica
Merge branch 'master' of https://github.com/sfranco/Android

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Aplicacion1/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Aplicacion1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Aplicacion1/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Aplicacion1/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml