no message
no message
Merge branch 'master' into gh-pages

Conflicts:
	2013/09/07/ishgo团队技术博客成立啦/index.html
	2013/09/08/addslashes,mysql_real_escape_string并不能防止SQL注入/index.html
	2013/09/15/ishgohexo团队博客主题/index.html
	2013/09/18/说说怎么部署静态网站到github上/index.html
	README.md
	index.html