Ajout règles (test)
Merge branch 'master' of https://github.com/SPIPS/killer

Conflicts:
	application/views/welcome_index.php