Merge remote-tracking branch 'origin/master'

Conflicts:
	oop/ex7/scope/Scope.java