iteracion4
iteracion4
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	gestograma/plantillas/gestionFase1.html
	gestograma/urls.pyc
	gtg/forms.py
	gtg/forms.pyc
	gtg/models.pyc
	gtg/views.py
	gtg/views.pyc
iteracion4
Merge https://github.com/RaquelOsorio/GTG

Conflicts:
	.idea/workspace.xml
iteracion4