Initial page commit
Delete index.html
Merge branch 'gh-pages'

Conflicts:
	index.html
File management
Merge branch 'master' into gh-pages