stuff
Merge branch 'master' of https://github.com/create/datefinder

Conflicts:
	client/www/index.html
	client/www/js/main.js
Merge branch 'master' of https://github.com/create/datefinder

Conflicts:
	client/www/index.html
	client/www/js/main.js