Delete ex1.js from branch 1.
Merge branch 'branch_2'

Conflicts:
	ex1.js
getDateAsString related changes.