Doing documantation
Fixed merge conflicts with docs