some refactoring
Merge branch 'master' of github.com:gustavopinto/hello-curiosity
integrating timeline with twitter
Merge branch 'master' of github.com:gustavopinto/hello-curiosity