Created Sphinx documentation (developer guide)
Resolved conflict