Merge pull request #29 from l1ll1/master

Code to allow James to type in the IP of cvldesktopdev
blah