Updated server to take certificate store file as a command-line parameter and a cert store password as user input.  Modified client to take server and port as parameters.
Resolved conflicts.