2014-07-24D
1. Add line7.
Merge branch 'master' of https://github.com/Ares198/Test1

Conflicts:
	1.txt

Signed-off-by: Ares198 <z198qq@126.com>