First commit
commit 2
Merge remote-tracking branch 'remotes/origin/master' into VladBranch

Conflicts:
	src/Hello.java