Fixed bug where master would not elect itself
Merge branch 'master' of github.com:SuperMass/distOS-lab2