commit to next brach
Merge branch 'nextbranch' into newbranch

Conflicts:
	chat-example/index.js
agin commit