Add "More..."
RESOLVE CONFLICT

Conflicts:
	index.html