better readme, cause poop
fixed merge conflict