redesign
merge pages
Merge branch 'redesign'

Conflicts:
	index.html