edit collective
Merge branch 'master' of https://github.com/maverickmw/ipynotebook