Updating AccessLevel and Conference to my local repository.
Committing ConferenceControl
Committing to my local repository
Merging a bunch of stuff to update current repository.

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

Conflicts:
	Conferences/src/control/ConferenceControl.java
	Conferences/src/model/AccessLevel.java
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/src/model/AccessLevel.java