Twitter API front end
fixing conflicts
Merge pull request #24 from thebitisland/twitterapi

Twitterapi