add body an id

add an id property
update content

update content
resolve conflict files

I have resolt this Conflicts:
	index.html