fix for main
main fix
Merge branch 'master' of https://github.com/GuyFliess/Compilation.git

Conflicts:
	Compilation 3/src/Main.java