Merge pull request #115 from RichardAvendano/splash

added mouse movement to splash page
Trending implementating for twitter feed
Implemented backend twitter Query service
Merge pull request #120 from jamondouglas/trendingQuery

Trending query Server Side Implementation
Now handling results where location is null
(cleanup) of package.json and queryTwitter.js
Merge pull request #121 from jamondouglas/trendingQuery

(cleanup) of package.json and queryTwitter.js
Instagram query sorts by relevance and proximity - handles different query calls (by tag, by location/time)
Added images of cities - color and black/white
Added tests for new Instagram API calls
Changed distance function
Merge branch 'assets/cities'
Removed ? in Readme
Merge pull request #122 from jasonerpenbeck/feat/instaQuery

(feat) Instagram results are sorted by relevance and proximity, can call API by tag or location/time
Merge pull request #124 from jasonerpenbeck/test/moretests

(test) Adjusted tests to cover new instagram API call
Merge pull request #125 from jasonerpenbeck/doc/readme

(doc) Made a grammatical fix to Readme
fixed dashboard
fixed package json