fd
Merge branch 'master' of https://github.com/DJxLaurens/ASG2

Conflicts:
	ASG2-ateam/src/main/MVCPatternDemo.java