Refactor
Merge branch 'master' of https://github.com/PatrickAndrade/top2developers

Conflicts:
	ConcurrentKeyValueStore/src/epfl/lsr/bachelor/project/benchmarks/KeyValueStoreBenchmark.java