master change
weird change
Merge branch 'master' into new

Conflicts:
	FibonacciAcc/src/fibonacci/main/FibonacciMainAccumulator.java