before merge
Merge branch 'master' of https://github.com/otownsend92/cs271_proj1_java

Conflicts:
	clientServer/src/clientserver/Paxos.java