i have fixed it
fixed index
I'm here
samuel delete
ok pamela
pamela update complete
ok go
Merge branch 'pamela'

Conflicts:
	index.html
merge with pamela complete