allow searching for hashtags and username simultaneously
Merge pull request #42 from philringsmuth/FIX_SearchByHashtagsAndUsername

allow searching for hashtags and username simultaneously