Problem: Solution wasn't set up correctly and client set up both server and client

Added project to solution, fixed client set up code.
Merge pull request #3 from putnap/master

Problem: Solution wasn't set up correctly and client set up both server ...