Initial commit
Improved the README
fix unmerged files error