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

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

Conflicts:
	.gitignore
changement nom package