Changed Link
Resolved conflicts

Conflicts:
	index.html