Merge branch 'master' of https://github.com/c4s4/docs.git