Maj serveur
Merge branch 'master' of https://github.com/Eirika/Bar-Stadium

Conflicts:
	shop/tests.py