Adding server file to project
Merge branch 'master' of https://github.com/kjnelson/ProgramminII.git
updating files
remove test files