version 5 pour error checkout ... files
Merge branch 'master' of ssh://git@github.com/mporiaux/demogithub1.git

Conflicts:
	bin/jarlist.cache
version PC