edit
Merge branch 'master' of https://github.com/deene/learn-ipython

Conflicts:
	.ipynb_checkpoints/Test-iPython-Notebook-checkpoint.ipynb