added initial content
added index page
Merge branch 'master' into gh-pages

Conflicts:
	index.html