replacing index.html
Merge branch 'master' of github.com:SwissChisel/swisschisel.github.com

Conflicts:
	index.html