changes to README
ignoring config file again
merging