gitignore
Merge branch 'master' of https://github.com/adenaud/booxtore-ejb

Conflicts:
	.gitignore
suppression des variables 'a' dans le "tunnel"