Changed welcome message to "Hi".
Merge branch 'mlesniak'

Conflicts:
	src/Main.java