initial commit
fixed conflict in README.md