table bgcolor added
branch two same line change

Signed-off-by: Maries <maries_284@yahoo.com>
Merge branch 'branchone' into branchtwo

Conflicts:
	hello.html

Signed-off-by: Maries <maries_284@yahoo.com>