added a bit more instructions to README
fixed stupid merge conflict