Update doc
Merge branch 'master' of github.com:josesahad/documentation-prototype