gfdgd
gfdg
dfgdfg
Merge branch 'travail'

Conflicts:
	src/main/java/com/lawek/App.java
Premières idées de classes en vrac.
Merge branch 'master' of https://github.com/mlkdru/nyloc