add index.html
mod README
Merge branch 'master' of github.com:koji--/koji--.github.com

Conflicts:
	index.html