Improved ConferenceRoom.java's holdMeeting
Merge branch 'master' of https://github.com/jcdesimp/SoftwareProjectDay
Git errors