silly change
Merge branch 'master' of github.com:dtudury/NaCl.IM

Conflicts:
	client/web/favicon.ico