Merge pull request #24 from Draky50110/master

Config + générale
Modif de termes
Amelioration aggregation, reduction taille des articles
Amelioration aggregation, reduction taille des articles
Merge branch 'Draky50110-master'

Conflicts:
	README.md
Merge pull request #1 from DMeloni/master

Mise à jour