commit pour faire un pull
Merge branch 'master' of github.com:baiche/Tauto

Conflicts:
	Generation/Generation.sql