nothing
Merge branch 'master' of https://github.com/leeleo3x/my_blog
修复了换行符输出的问题
增加了个人信息提取功能
deleted front files
nothing
终于又可以用github了。。。优化了输出
Merge pull request #6 from leeleo3x/backend

Backend
Merge branch 'frontend' of https://github.com/leeleo3x/my_blog into backend

Conflicts:
	application/controllers/blog.php
	application/models/blog_model.php
	application/views/blog/admin_login.php
	application/views/blog/create_main.php
	application/views/blog/index.php
	application/views/blog/page.php
	application/views/blog/view.php
	application/views/templates/footer.php
	application/views/templates/header.php
	resources/css/blog.css
	resources/js/theme.js
Merge branch 'master' of https://github.com/leeleo3x/my_blog into backend
增加了更换头像的功能
blog can resize the photo admin uploaded