testing

testing this out
Deleted unnecessary files
added index page
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/edelstone/Testing into gh-pages