deleting layers works
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/framework/PieChart.js
	APP/framework/controller.js
	APP/framework/twitter.js
	APP/framework/ui.js
changed the popup colors
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/css/style.css
busstop markers are up and running. Need predicition stuffs
Merge remote-tracking branch 'origin/master'
Uber is in now
Lights out works
Merge remote-tracking branch 'origin/master'

Conflicts:
	APP/framework/controller.js
adjusted SimpleMarkers colors
pushing stuff
pushing stuff
Merge remote-tracking branch 'origin/master'
pushing stuff