cd
zx

Conflicts:
	index.html