Initial commit
Improve the README
add .gitignore file
conflict