Merge remote-tracking branch 'github/ideea1' into ideea1

Conflicts:
	src/helloworld/Main.java
Merge pull request #2 from 89iuv/ideea1

Merge remote-tracking branch 'github/ideea1' into ideea1