Changing around README to be more server-node based.
Fixing merge conflict.