adding tweet class
Merge branch 'master' into javier
twitter madness