branch commit 1
Branch commit 2
added comment
change
Merge branch 'addingBodyContent'

Conflicts:
	Work_Folder/samplesite.html
Merge branch 'origin/master'

Conflicts:
	Work_Folder/samplesite.html