version medio final 1ra iteracion
Merge branch 'master' of https://github.com/yank07/WPM

Conflicts:
	principal/models.py
	principal/views.py