Clean up css for new layout
testing diff
try out merge conf
itest
Merge branch 'diff_sample'

Conflicts:
	index.html