modified:   xbee-api-0.9/src/com/P6/xbee/Main.java
Merge branch 'master' of https://github.com/mindisx/P6

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