Ajustes Estandarización de Código
Merge branch 'master' into christian

Conflicts:
	Codigo/throughCode/throughCode/AndroidManifest.xml
	Codigo/throughCode/throughCode/src/mx/itesm/throughcode/Interfaz.java
Ajustes Merge