-Sección explorar lista. Falta detalle
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_21_0_0_rc1.xml
	app/app.iml
	app/build.gradle
	app/src/main/java/com/example/jhordan/semprende/MyActivity.java
	app/src/main/java/com/example/jhordan/semprende/fragments/Explorer.java
-Sección explorar lista. Falta detalle