Started working on the chunk server and made client continuosly attempt to connect to servermaster.  Also added chunkserver array to servermaster
Fixed merge conficts
Merge branch 'master' of https://github.com/tfs-cs485-team-awesome/tfs
Server can separate clients and chunkservers