change index and add pages
index page -> home page

index.html is the real working page
Merge branch 'pages'

Conflicts:
	index.html