somting else
Merge branch 'master' of https://github.com/leeleo3x/my_blog

Conflicts:
	application/views/blog/create_main.php