update
Merge branch 'master' of https://github.com/marcacohen/blabber

Conflicts:
	index2.html