calendar json
event modal add
Merge branch 'master' of https://github.com/tylerkern/pro260_team4

Conflicts:
	pro260_team4/pro260_team4.csproj