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

Twitterapi
Merge branch 'master' into wordcloud
added marker on search