remove a line
added a yahoo link
merge

Conflicts:
	index.html

merged from master