better index.html
Merge branch 'master' of github.com:yoshik/octochat

Conflicts:
	octochat/app/views/index.scala.html