data-type struct
Merge branch 'master' of github.com:stormhouse/pyStudy

Conflicts:
	fun1.py