Initial commit
README.md confict fixed