Initial commit
Improve the README
fixed conflicts