Saving updates locally
Merge branch 'master' of https://github.com/kngrace/Conferences.git
Merge branch 'master' of https://github.com/kngrace/Conferences.git
Re-added Conference Control
Recommitting classpath and controller example
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/.classpath
	Conferences/src/control/ControllerExample.java
Merge branch 'master' of https://github.com/kngrace/Conferences.git
fix
fixing classpath (the most annoying file in existance)