Changes to READ.me
Added partial files
Manually fixed merge conflicts