Replication works
Allowed for subdirectory input
Merge branch 'master' of ssh://github.com/darrinwillis/distributedSystems

Conflicts:
	lab3/src/MasterServer.java
Administrative changes