Pequenas correções
Merge remote-tracking branch 'origin/master'

Conflicts:
	Quack/src/quack/ServerImpl.java
Merge branch 'master' of https://github.com/luksfarris/MC851-Quack