evaluate
merge
Merge branch 'master' of https://github.com/cbarazarte7/Software_Tarea_4

Conflicts:
	db.sqlite3
	evento/views.py