Change by A
Done issue 1
Merge branch 'issue1'

Conflicts:
	hello.html