modified by YHJ, the first time
modified by YHJ, the first time
second time
Merge branch 'YHJ' of github.com:tianxiafengyu/vast-challenge-2011-MC1

Conflicts:
	vast.js