aikalta muutos
Merge branch 'master' of github.com:stibe/helloworld

Conflicts:
	helloWorld.php