merge conflict
Merge branch 'barchart' of https://github.com/BetaNYC/nyc-open-government-timeline into barchart
Merge branch 'barchart' of https://github.com/BetaNYC/nyc-open-government-timeline into barchart