More README updates
Add the license
Fix the merge conflict