Added some comments and fixed a small performance bug in leader election
fixed merge conflicts
More comments and deletion of two old files
Removed all printouts