Creating initial version of docs
Fixing merge conflicts