algoritmo
Cambios para presentacion final
Merge branch 'PresentacionFinal' of https://github.com/albrinbor/ispp8 into PresentacionFinal

Conflicts:
	ispp8/ispp8/settings.py
Merge branch 'master' into Plan_algorithm

Conflicts:
	ispp8/plan/models.py
	ispp8/plan/views.py