Twitter shiz
Merge pull request #3 from oompt/master

Twitter shiz