Cleaning up
Merge branch 'master' of https://github.com/nadav144/ex7

Conflicts:
	src/oop/ex7/main/Sjavac.java
Bla
Merge branch 'master' of https://github.com/nadav144/ex7