junk
Merge branch 'master' of https://github.com/wynllc/discid

Conflicts:
	runUDP
take out debugs
touch