initial commit
fixed README.md conflict