En la rama master
 Your branch is up-to-date with 'origin/master'.
 Cambios para hacer commit:
	new file:   app/admin.html
	modificado: app/api/composer.json
	modificado: app/api/index.php
	new file:   app/api/temp/513620131245161245.pdf
	new file:   app/images/left-arrow.png
	new file:   app/images/reciclado/imagen1.png
	new file:   app/images/reciclado/imagen1.png.txt
	new file:   app/images/reciclado/imagen1.png.txt~
	new file:   app/images/reciclado/imagen2.png
	new file:   app/images/reciclado/imagen2.png.txt
	new file:   app/images/reciclado/imagen2.png.txt~
	new file:   app/images/reciclado/imagen3.png
	new file:   app/images/reciclado/imagen3.png.txt
	new file:   app/images/reciclado/imagen3.png.txt~
	new file:   app/images/right-arrow.png
	new file:   app/scripts/admin.js
	modificado: app/scripts/controllers/contacto.js
	modificado: app/scripts/controllers/reciclado.js
	new file:   app/styles/admin.scss
	modificado: app/styles/main.scss
	modificado: app/views/contacto.html
	modificado: app/views/estudio.html
	modificado: app/views/home.html
	modificado: app/views/procrear.html
	modificado: app/views/reciclado.html
	renombrado: app/views/home.html -> app/views/upload.html
	modificado: guarino.sublime-workspace