test
testMerge branch 'master' of https://github.com/yujunjie0603/projetcodeigniter

Conflicts:
	.htaccess