Create index.html
Create .gitignore
Update index.html
update
update
Update index.html
Merge branch 'gh-pages'

Conflicts:
	index.html
update
Update style1.css
background change
Merge branch 'master' into gh-pages