Nuevos cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/jorge/recetario/DatosArrayList.java
	app/src/main/java/com/example/jorge/recetario/Principal.java