added what I worked on
added what I worked on
Temporary fix - allows to draw to svg's
BusStop data loaded
Yelp data is up and running!
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/data/database.js
Pushing latest marker changes
Merge branch 'master' of https://github.com/RightHereRightNow/RightHereRightNow.github.io

Conflicts:
	APP/framework/controller.js
Merge branch 'master' of https://github.com/RightHereRightNow/RightHereRightNow.github.io

Conflicts:
	APP/framework/controller.js
now twitters are showing into console on click on yelp marker
Graph functions added
Merge branch 'master' of https://github.com/RightHereRightNow/RightHereRightNow.github.io
added twitters and modified queries' limit to 5000
added twitters and modified queries' limit to 5000
Files added
Merge branch 'master' of https://github.com/RightHereRightNow/RightHereRightNow.github.io
added twitter data and bug fixes on database
chicago data fetching
Merge branch 'master' of https://github.com/RightHereRightNow/RightHereRightNow.github.io

Conflicts:
	APP/framework/ui.js
fixed tweets