Merge branch 'add_berardi' of https://github.com/gburtonhome/acm.pdx.edu into gburtonhome-add_berardi

Conflicts:
	files/events.yaml