favicon
index conflict

Conflicts:
	index.html
Resolve Index Conflict

Copies made