Added a few document files
Resolved Merge Conflicts