Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of https://github.com/sagemath/sagenb

necessary,
Merge branch 'master' of https://github.com/sagemath/sagenb
Merge branch 'master' of github.com:kcrisman/sagenb