First results. (Throw-away changes)
Merge branch 'master' of github.com:rdadolf/autopaxos

Conflicts:
	Makefile
	main.tcc
	paxos.tcc