first commit
Merge branch 'master' of https://github.com/pham-thuan-mulodo/blog

Conflicts:
	.htaccess
	composer.phar
	fuel/app/config/config.php
	fuel/app/config/development/db.php