Todo taller 1
oli
Merge branch 'master' of https://github.com/juansmacias/Sischok.git

Conflicts:
	bin/Sischok.apk
	bin/classes.dex
	bin/classes/uniandes/sischok/Inicio.class
	bin/classes/uniandes/sischok/incidenteListActivity.class
	bin/resources.ap_
	src/uniandes/sischok/Inicio.java
	src/uniandes/sischok/incidenteListActivity.java