mamadas
Merge branch 'master' of https://github.com/SyNeto/proyecto_cgv

Conflicts:
	cgv/cgv/urls.py