prep for merge
fixes merge conflict
adds ajax call for tweets in mongo
prep for merge
Merge branch 'feature/new-globe' of https://github.com/HR-Data-Geyser/Data-Geyser into newglobe
adds twitter data flashes from database
Merge pull request #38 from biversen21/newglobe

adds twitter flashes from database