MAJ
Merge branch 'master' of https://github.com/sh444dow/HelloWorld

Conflicts:
	src/Main.java