add functoinal destroy links to edit-events page
fix merge conflicts
adjust files
Merge branch 'master' of github.com:BetaNYC/nyc-open-government-timeline
create timeline.js file, created nested json calls