Solucionando errores.
Merge branch 'fixerrors'
Merge branch 'master' of github.com:nigrid/twitter