added branch gh-pages
Fine tune some css
Rename main.html to index.html
Merge branch 'gh-pages'

Conflicts:
	css/main.css
Deleted main.html added index.html
Deleted main.html