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

Conflicts:
	.idea/workspace.xml
	src/oop/ex7/main/Compiler.java