Revert "20140711晚间"

This reverts commit 52e2881166875eaffc066cf1d0216011440c99f3.

Conflicts:
	sample1.txt
	script1.py
	script2.py