More style
Merge branch 'master' of https://github.com/daffes/mc011

Conflicts:
	lab1/antlr-generated/JornalDemo.java