Enable parameterized benchmark methods
[MOD] making tests working again by adding minor changes
[MOD] formatting everything correctly
[MOD] more formatting
[MOD] formatting everything
Enable parameterized benchmark methods, disabling merge errors

Conflicts:
	src/main/java/org/perfidix/Benchmark.java
	src/main/java/org/perfidix/element/BenchmarkExecutor.java
	src/main/java/org/perfidix/element/BenchmarkMethod.java
	src/main/java/org/perfidix/ouput/AbstractOutput.java
	src/main/java/org/perfidix/ouput/CSVOutput.java
	src/main/java/org/perfidix/ouput/TabularSummaryOutput.java
	src/main/java/org/perfidix/result/BenchmarkResult.java
	src/main/java/org/perfidix/result/MethodResult.java
	src/main/java/org/perfidix/socketadapter/SocketListener.java
	src/test/java/org/perfidix/element/BenchmarkExecutorTest.java
	src/test/java/org/perfidix/output/CSVOutputTest.java
	src/test/java/org/perfidix/output/TabularSummaryOutputTest.java
	src/test/java/org/perfidix/result/ResultContainerTest.java
][MOD] making tests working again by adding minor changes

Conflicts:
	src/main/java/org/perfidix/element/BenchmarkMethod.java
	src/main/java/org/perfidix/result/MethodResult.java
	src/test/java/org/perfidix/element/BenchmarkExecutorTest.java
[MOD] formatting everything
Merge branch 'formerMaster'

Conflicts:
	src/main/java/org/perfidix/element/BenchmarkExecutor.java
	src/main/java/org/perfidix/ouput/CSVOutput.java
	src/main/java/org/perfidix/result/MethodResult.java
	src/test/java/org/perfidix/result/ResultContainerTest.java
[MOD] added nicos contribution