Sync ex0.js
Merge branch 'branch_1'
New function in branch 1.
Merge branch 'branch_1'
Merge branch 'branch_2'

Conflicts:
	ex0.js