Merge branch 'master' of https://github.com/patatje368/infswa02

Conflicts:
	src/infswa02/Main.java