Pushing a commit before I do a pull.
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/src/model/Conference.java