edit the text from text editor in windows
Merge branch 'master' of https://github.com/djokinen/helloworld

Conflicts:
	index.html