merge portable
Merge branch 'master' of https://github.com/subsib/graphe

Conflicts:
	Makefile
	Node.java