Merged mine with y
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/view/ConferenceGui.java