Fichero para Fabric
Merge branch 'develop' of github.com:dev-fjn/Fundacion into develop
Problemilla con git + fabfile.py
Conflicts:
	fabfile.py
Resuelto conflicto con fabfile
Merge branch 'develop' of github.com:dev-fjn/Fundacion into develop

Conflicts:
	fabfile.py