Conflict
Merge branch 'master' of https://github.com/serginxs/hello

Conflicts:
	hello.html