Date.js branch
Merge branch 'date.js'

Conflicts:
	README.md