ignore
jn
Merge branch 'master' of https://github.com/PROJETK/Projet-K

Conflicts:
	.gitignore
	application/config/config.php