Merge pull request #48 from tvkwoodlands/master

pushing working network code
Merge pull request #49 from tvkwoodlands/master

pushing server
Merge pull request #50 from tvkwoodlands/master

imported server by making all its output go to the gui
Merge pull request #51 from tvkwoodlands/master

pushing server
Merge pull request #7 from csce431-e/master

pulling