Add gitbook to list of tools to generate docs
Fixing merge conflict
Merge branch 'SamyPesse-patch-1'
Manual merge