Showing output of deploy command
Merge branch 'master' of https://github.com/xyos/horarios
hotfix for adblock bug.
adding deploy task to fabfile
Merge remote-tracking branch 'origin/master' into development