Merge origin/master

Conflicts:
	INFDTA022/src/infdta022/INFDTA022.java
	INFDTA022/src/infdta022/PearsonCalculator.java
Merge origin/master