quitando un poco de static (usar collectstatic)
Merge branch 'master' of github.com:Rafillo/HijxsdePeru

Conflicts:
	settings/settings.py