Reoganized code, added error reporting, and now successfully connects
Merge branch 'master' of https://github.com/eraye1/cs118-project1