basic server working
Merge branch 'basic-server'