homie
Merge branch 'master' of https://github.com/emrhzc/qweqwe

Conflicts:
	ccc/.htaccess
	ccc/application/config/database.php