Merge README.md
Merge remote-tracking branch 'origin/master'
server dir added