commit
Merge branch 'master' of https://github.com/bigbearxiong/bigbearxiong.github.com

Conflicts:
	params.json