Updated README
Bare bones of a server
Fixed merge conflicts