Commentaire de fonction
Modification de la base de donne suite a un merge
Merge branch 'master' of https://github.com/selas/projet-atpa

Conflicts:
	atpa/appli/models.py
	atpa/atpa/atpa.db