visszalelep utani commit
Merge branch 'master' of github.com:smeyel/jclub

Conflicts:
	Hello/hello.cpp