Added connection logic
Merge branch 'master' of github.com:jpulec/CS638_proj3