Changed json
Merge branch 'MapTimelineMix' of https://github.com/pnispel/csce496_ibooks_widgets into MapTimelineMix
Merge branch 'MapTimelineMix' of https://github.com/pnispel/csce496_ibooks_widgets into MapTimelineMix

Conflicts:
	maptimeline.wdgt/data.jsonp