contacto django nada
Merge branch 'master' of https://github.com/Reston/duranjo

Conflicts:
	duranjo/apps/homepage/views.py