Main updated
Merge branch 'master' of https://github.com/TjarcoKerssens/AP2.git

Conflicts:
	src/assignment2/DataSetInterface.java