。。。
Merge branch 'master' of github.com:tianxiafengyu/vast-challenge-2011-MC1

Conflicts:
	index.html
	vast.css