syncing two PCs with conflicting data
syncing conflicts
Merge branch 'Ebby' of https://github.com/ebbyw/FIU-CIS-Events-Calendar into Ebby

Conflicts:
	FIU CIS Events Calendar.xcodeproj/project.pbxproj
syncing conflicts