testing commit
deleted class files
Merge branch 'develop' into feature-AWFbpp
Merge branch 'develop' into xmlloader
XMLLoader added
Merge branch 'develop' into feature-AWFbpp
Merge branch 'develop' into feature-AWFbpp
nothing
Merge branch 'develop' into feature-AWFbpp
Merge branch 'develop' into xmlloader
merge
Added to do list at feature-AWFbpp
Merge branch 'develop' of github.com:luukholleman/ASRSJava into feature-AWFbpp
Started calculateBin
Merge branch 'develop' into feature-AWFbpp
Merge branch 'develop' into feature-AWFbpp

Conflicts:
	bppAlgorithm/AlmostWorstFit.java
Merge branch 'develop' into feature-AWFbpp
Merge branch 'develop' of github.com:luukholleman/ASRSJava into xmlloader
Merge branch 'develop' into feature-AWFbpp
nothing