test2
Merge branch 'master' of https://github.com/chrono13/pdl.git

Conflicts:
	pdl/src/ihm/test.java