Signed-off-by: wangtm <wangtangming888@gmail.com>
Merge branch 'master' of github.com:wangtm/wangtm.github.com

Conflicts:
	_posts/2013-9-24-QTP-learning-record-Acquaintance-QTP.md