gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	code-igniter/application/config/database.php