better homepage
Merge branch 'master' of github.com:jeromeetienne/chatandfight

Conflicts:
	index.html