new meeting
upcoming metting function
Merge remote-tracking branch 'origin/teste' into Ricardo2
Merge remote-tracking branch 'origin/teste' into remoteBranch

Conflicts:
	src/Client.java
readme update
reply new meeting
client new meeting
Merge remote-tracking branch 'origin/teste' into Ricardo2
bug fixs