errs
Merge remote-tracking branch 'origin/teste' into Ricardo2

Conflicts:
	README.md
	src/Client.java
errs