up
up
Merge branch 'master' of https://github.com/YvensFaos/SD_TrabalhoNP2

Conflicts:
	GhostAudioSocket/dist/GhostAudioSocket.jar
	GhostAudioSocket/test/audio/ClientTest.java
	JavaRmiNetlixo/src/rmi/test/Chat.java
	RMIInterfaceTest/dist/RMIInterfaceTest.jar
	RMITest/dist/RMITest.jar
	RMITest/dist/lib/RMIInterfaceTest.jar
	RMITest/src/TestJFrame.form
	RMITest/src/TestJFrame.java