fixed paxos with tcp
Merge branch 'master' of https://github.com/abhardwaj/barista

Conflicts:
	src/server/src/main/server.go