ndarray的类型，数组和标量的计算
Merge branch 'master' of https://github.com/baimoon/python_study_demo

Conflicts:
	numpy/num_study.py