blaa
Merge branch 'master' of https://github.com/kkjawz/oop-ex7

Conflicts:
	src/oop/ex7/scopes/GlobalScope.java
	src/oop/ex7/scopes/MethodScope.java
	src/oop/ex7/scopes/Scope.java