adding locally
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/src/control/ConferenceControl.java
	Conferences/src/control/ControllerExample.java