fix
rm nohup.out
Merge branch 'master' of github.com:scuzhanglei/scuzhanglei.github.io

Conflicts:
	_posts/2014-04-11-mysql-innodb.md
	_posts/2014-04-26-meta-ruby.md