agregando nueva entidad de prueba
Merge branch 'master' of https://github.com/urkh/agenda

Conflicts:
	agenda/application_admin.py
	agenda/model.py
modificado .gitignore
Merge branch 'master' of https://github.com/urkh/agenda