modified:   xbee-api-0.9/bin/com/P6/xbee/Main$1.class
	modified:   xbee-api-0.9/bin/com/P6/xbee/Main.class
	new file:   xbee-api-0.9/bin/com/P6/xbee/t.class
	modified:   xbee-api-0.9/src/com/P6/xbee/Main.java
	new file:   xbee-api-0.9/src/com/P6/xbee/t.java
Merge branch 'master' of https://github.com/mindisx/P6

Conflicts:
	xbee-api-0.9/src/com/P6/xbee/Main.java

	modified:   TestPC/bin/ServerSide.class
	modified:   TestPC/bin/ServerThread.class
	modified:   TestPC/src/ServerThread.java
	deleted:    xbee-api-0.9/src/com/P6/xbee/Client.java
	modified:   xbee-api-0.9/src/com/P6/xbee/Main.java
	new file:   xbee-api-0.9/src/com/P6/xbee/SinkClient.java
	renamed:    xbee-api-0.9/src/com/P6/xbee/ServerThread.java -> xbee-api-0.9/src/com/P6/xbee/SinkServerThread.java