Merge branch 'master' into 'vishal'

# Conflicts:
#   LFU.h
#   LRU.h
#   client.cpp
#   dns.cpp
#   server.cpp

client.cpp

@@ -160,6 +160,7 @@ void RunClient() {
   Info info;
   ClientContext context;
   Status status=stub->GETADDRESS(&context,null,&info);
+  std::cout<<"Server: "<<info.address()<<std::endl;
   std::string target_address(info.address());
   // Instantiates the client
   KeyValueServicesClient client(

dns.cpp

@@ -186,7 +186,13 @@ private:
     RequestType reqType;
 };
 
+void signalHandler(int signum) {
+    remove(SERVERS);
+    exit(0);
+}
+
 int main(int argc,char **argv) {
+    signal(SIGINT, signalHandler);
     srand(time(0));
     string server_address("0.0.0.0:1234");
     builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());