Merge branch 'hai' into 'master'

src/GUI/PaintGUI.java

src/client/Client.java

src/client/EncryptionUpdate.java

src/remote/IClientController.java

src/remote/IEncryptionUpdate.java

src/server/ClientController.java

src/server/MySharedKey.java

src/server/Server.java