changed server IP address
adding debugging
fixed merge conflicts