Adding JDBC Connection
Saving locally
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/src/control/ConferenceControl.java
	Conferences/src/control/ControllerExample.java
Adding a fixed conference control
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/src/control/ConferenceControl.java
Merge branch 'master' of https://github.com/kngrace/Conferences.git
Pulled latest from Github and adding to personal repository now.