Added index
Merge branch 'master' of https://github.com/bgreenlees/my-project

Conflicts:
	index.html