updated format of json file
updated some formatting
fixed merge conflicts
updated old json file
updated function to only events with future eventdate