Undo Revert "Merge branch 'master' of github.com:mexus/medici""

This reverts commit 690d00e8b1e67af925eae10cc8a50a53729c1eba.