fixed bug referencing 824 paxos lab. paxos references now refer to paxos in this project
merge from master