E
Merge branch 'master' of github.com:marcgg/demogit

Conflicts:
	trucs