sync date
Merge branch 'master' of https://github.com/pwwpche/weather

Conflicts:
	script.js
	socket.js