temp
Merge branch 'Jeroen' of https://github.com/11gamer11/Softwaresystemen into Jeroen

Conflicts:
	Week 7/.checkstyle
	Week 7/src/ss/week7/Util.java