2014.3.6 add tanglanting_1
Merge branch 'master' of github.com:tangting12/helloworld

Conflicts:
	aa.txt