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
adds pinch event
adds drawEdge functionality
adds edges with removal
adds button to trigger edges
Merge branch 'feature/new-globe' of https://github.com/HR-Data-Geyser/Data-Geyser into newglobe
fixes toggle of button
adds oculus rift visualization
Merge pull request #39 from biversen21/newglobe

adds pinch event
lens flare, spark
Merge branch 'feature/new-globe' of github.com:HR-Data-Geyser/Data-Geyser into feature/new-globe
globe-test