Return as usual in exception
Merge branch 'master' of https://github.com/GuyFliess/Compilation.git

Conflicts:
	Compilation 2/src/Main.java