Creation Master
Conf git
Conf git
Formattage
Merge branch 'master' of https://github.com/jdesachy/TRUNK

Conflicts:
	.gitignore