conflicts resolved
Functionality: search tweets by text, implemented
Merge pull request #22 from vineetasharma/ISSUE_21

Issue 21