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

Conflicts:
	ispp8/ispp8/settings.py