Merge remote-tracking branch 'origin/ian_Branch'

Conflicts:
	.gitignore
Got it to send data
Merge in fixes to UDP client/server
Merge branch 'master' into ian_Branch