first commit for branch bobo
Added command line arguments to specify IP's and ports instead of hardwiring. Added help messages.
Fixed merge conflict