CodeIgniter add
Merge branch 'master' of ljcode:ljcode/ljcodeRepository
Merge pull request #3 from ljcode/master

update master
Merge pull request #5 from liangxifeng833/master

CI 图片上传helper公共文件添加
CI upload_helper.php add
add php-excel-demo
Merge pull request #6 from liangxifeng833/master

添加php读取和导出excel demo
Merge pull request #4 from ljcode/master

合并作者的更新
php readme.md update
php readme.md update
add email_demo
Revert "add email_demo"

This reverts commit 8ed7e130da9ca4ec1cb6e83e7436dfd16ec69414.
Merge pull request #7 from liangxifeng833/master

添加php发送email-demo
add php email demo
Merge pull request #8 from liangxifeng833/master

php readme.md update
upate php readme.md
upate php readme.md
rln add test dir
Merge pull request #9 from congyi-2014/master

娜娜添加测试
Merge pull request #5 from ljcode/master

更新娜娜的test