Fotos de las galletas
Merge branch 'master' of https://github.com/IV-GII/SocialCookies

Conflicts:
	ENV1/webcookies/socialcookies/templates/socialcookies/index.html