Some modifications
Merge branch 'master' of git@github.com:pierrebinauld/Journey.git
Minor bugs fixed.
Merge
Merge branch 'master' of github.com:pierrebinauld/Journey

Conflicts:
	src/Main.java
	src/benchmark/impl/TabuBenchmark.java