Merge branch 'master' of https://github.com/cgrin/Pydata

Conflicts:
	Chapter2.ipynb
Merge branch 'master' of https://github.com/cgrin/Pydata