Initial commit
fixed conflic in README.md