layout changes, boxes
resolved index.html conflict

Conflicts:
	index.html