subida 20:18 to delete!
Merge branch 'gallery' of https://github.com/lacetans/pyges into gallery

Conflicts:
	src/pyges/pyges/__init__.py
	src/pyges/pyges/views.py
Conflicto