typing rules fix
Merge branch 'master' of https://github.com/GuyFliess/Compilation.git

Conflicts:
	Compilation 4b/src/scope/MethodScope.java