Merge pull request #179 from dshurt/master

Master
Fix client project so loads in netbeans.  Just leave these files here they make working with the project easier.