Merged with old erldocs (unmerged) repo
Merge branch 'master' of github.com:fenollp/erldocs