Formatting the code
WIP fixing replication + renaming
Merge branch 'master' of github.com:rockyhe/rockykevinleon

Conflicts:
	eece411/phase2/src/phase2Pack/KVStore.java
	eece411/phase2/src/phase2Pack/Server.java
	eece411/phase2/src/phase2Pack/bak/ServerHR.java