index
Merge branch 'master' of github.com:smileface/html

Conflicts:
	index.html