Merge branch 'master', remote-tracking branch 'upstream/master'
added NODEMGMT folder to Makefile
Merge branches 'randomNumber' and 'master'
Merge pull request #33 from jim17/master

NODEMGMT and Makefile