Ni idea

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>
Merge branch 'master' of https://github.com/alfabrad/tuFotoConElGuero

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>

Conflicts:
	js/main.js
	js/main.min.js
	js/main.min.map