Revert "esssai"

This reverts commit 01271879ea16933742b53576d3dbd9057728da48.
Essai de correction de Git caca.
Merge branch 'master' of https://github.com/kurisuter/projet_c

Conflicts:
	nbproject/configurations.xml
	nbproject/private/private.xml