removing some files
Merge branch 'server'