Modification to ex1.js in branch_2.
Merge branch 'branch_2'

Conflicts:
	ex1.js