hello world changed
some changes
Merge branch 'master' of https://github.com/cistox/_webdevcistox

Conflicts:
	work/assignment1/HelloWorld.html