Script para crear permisos
Mas commit
Preparando getPermisos
Merge branch 'Postgre'

Conflicts:
	microblog/app/__init__.pyc
	microblog/app/views.pyc
	microblog/config.pyc
Commit en branch principal
Problemas con else
Preparando items
Modelo Item
Vista item
comit antes de la it. 4