* Merge conflict * Renamed docs * Addressed comments * Addressed comments * Moved glossary * Minor mistake
