base
Merge branch 'master' of https://github.com/alexzhxin/ipys

Conflicts:
	README.md