attendees
Merge branch 'master' of github.com:JakeAlbee/cs365FinalProject

Conflicts:
	events.py