added a test file
changed a variable
Merge branch 'server'