...
Merge branch 'master' of https://github.com/dangquanglight/LightProject

Conflicts:
	.idea/workspace.xml
...
Merge branch 'master' of https://github.com/dangquanglight/LightProject
Merge branch 'master' of https://github.com/dangquanglight/LightProject

Conflicts:
	application/views/home.php