First try at the confusing server logic
Server Completed
Merge branch 'lab8-server' into development