Create README.md
Update Conference.java
Merge pull request #1 from kngrace2/master

Update Conference.java
Merge remote-tracking branch 'github/master' into notmaster

Conflicts:
	Conferences/src/model/Conference.java