First commit
Site updated: Sun Jun 23 2013 08:59:46 GMT+0800 (CST)
Site updated: Sun Jun 23 2013 09:03:59 GMT+0800 (CST)
Merge branch 'master' of github.com:lixm/lixm.github.io

Conflicts:
	index.html