added a tar.gz file to git
changed IP address
fixed merge conflicts