add line A
Merge branch 'master' into dev
add line B
Merge pull request #22 from leirocky/dev

Dev
Add CodeIgniter user guide
Merge branch 'master' into development
Merge pull request #23 from morningwinter/development

Add CodeIgniter user guide