Property File Change
Merge branch 'master' of https://github.com/robbieford/javAX25

Conflicts:
	config.properties