Signed-off-by: Gert Vilain <gert.vilain@student.kdg.be>
Merge remote-tracking branch 'origin/master'

Conflicts:
	teamB/src/main/java/b