【python】ignore
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	study/.gitignore
	study/hzg/study/checkaddr_1.py
	study/hzg/study/checkaddr_2.py
	study/hzg/study/output.py
	study/hzg/study/pyqt/tetris.py
	study/hzg/study/pyside/foo.py
	study/hzg/study/pyside/helloworld_1.py
	study/hzg/study/pyside/helloworld_2.py
	study/hzg/study/pyside/helloworld_2.qml
	study/hzg/study/pyside/listdemo.py