Cleaned up Conference Control some.
Pushing the database
Going to remerge my controlbranch back
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/ConferenceDB.sqlite