swapping old demo for newer/cooler citibike demo (not complete)
replaced boring demo with citibike demo, plus some bugfixes
citibike + gov tours in one file (has bugs)