S
Merge branch 'master' of https://github.com/El-gitano/CProject

Conflicts:
	Code/Programme/test.sqlite
Optimisations mineures