updated java code for UDP
added some comments, need to correct pwm pin numbers
Merge branch 'master' into UDP, combined serial packets
Merge branch 'may3' into UDP

Conflicts:
	amity-island/src/ControlStation.java
	amity-island/src/GamepadModel.java
	amity-island/src/ThrusterController.java
up to date
fixed commit errors
serial debugging
pretty sure it sends the right serial packets now
Merge branch 'udp'

Conflicts:
	amity-island/.classpath
	amity-island/src/ControlStation.java
	amity-island/src/GamepadModel.java
	amity-island/src/ThrusterController.java