+
Merge remote-tracking branch 'origin/master' into master-2

Conflicts:
	src/lab2/Master.java