Merge branch 'master' of github.com:VictorXianwu/victorxianwu.github.com

Conflicts:
	index.html

Signed-off-by: Victor Lin <linxianwusx@gmail.com>
2013-09-27
Merge branch 'master' of github.com:VictorXianwu/victorxianwu.github.com

Conflicts:
	index.html