python3修订版
Merge remote-tracking branch 'origin/master'

Conflicts:
	ch05_if/sp_generate.py
	ch06_file/sp_basic.py