update css and index.html
update css and index
update css

Conflicts:
	css/style.css