modificacion isaac
Merge branch 'master' of https://github.com/Isaacf/webPhotho

Conflicts:
	nuevo.txt