Added a Meeting class
Fixed conflict, sorry