clean install of code igniter

Signed-off-by: Callum Macdonald <callum@redevolution.com>
Merge branch 'master' of https://github.com/callummac88/aboil

Signed-off-by: Callum Macdonald <callum@redevolution.com>

Conflicts:
	.idea/workspace.xml
	application/config/database.php