merge
Merge branch 'master' of https://github.com/ldemarest/modernmind
private minds
Merge branch 'master' of https://github.com/ldemarest/modernmind
Merge branch 'spencer'