测试公网数据库
Merge branch 'master' of https://github.com/amberzizi/myblogamberzi

Conflicts:
	application/views/my_index.php