cleanup
Merge branch 'master' of https://github.com/yoavfreund/UCSD_BigData

Conflicts:
	notebooks/sorting/.ipynb_checkpoints/Sorting-checkpoint.ipynb