Merge branch 'master' into feature/http

makefile

@@ -13,10 +13,6 @@ docker:
 run:
 	docker run --cap-add sys_ptrace -it broadcast_server:latest bash
 
-# this is helpful to remove trailing whitespaces
-trail:
-	sh third_party/remove_trailing_whitespaces.sh
-
 # this is helpful to remove trailing whitespaces
 trail:
 	sh third_party/remote_trailing_whitespaces.sh

ws/ws.cpp

@@ -9,6 +9,10 @@
 //
 #include "ws.h"
 
+//
+// Main drive for websocket utilities
+//
+
 #include <string>
 #include <sstream>
 #include <iostream>
@@ -41,7 +45,6 @@ int main(int argc, char** argv)
     sendApp->add_option("url", url, "Connection url")->required();
     sendApp->add_option("path", path, "Path to the file to send")
         ->required()->check(CLI::ExistingPath);
-
     CLI::App* receiveApp = app.add_subcommand("receive", "Receive a file");
     receiveApp->add_option("url", url, "Connection url")->required();
 

ws/ws_chat.cpp

@@ -5,9 +5,10 @@
  */
 
 //
-// Simple chat program that talks to the node.js server at
-// websocket_chat_server/broacast-server.js
+// Simple chat program that talks to a broadcast server
+// Broadcast server can be ran with `ws broadcast_server`
 //
+
 #include <iostream>
 #include <sstream>
 #include <queue>