aaa
Merge branch 'master' of https://github.com/greggz/projet-genielog.git

Conflicts:
	src/bl/Facade.java
Merge branch 'master' of https://github.com/greggz/projet-genielog.git