Extended the README a bit
Fixed conflict in README