Commit des familles
COmmit test
Merge branch 'master' of https://github.com/SebHeuze/GLOEiffelProject

Conflicts:
	application.h
	application.id
	application1.c
	application2.c