Added installation instructions
Fixed conflict in README