minor changes
fixed merge conflicts
working on relay data handler
Merge branch 'master' of https://github.com/jcm1317/Networks_14