update
Merge branch 'master' of https://github.com/smoke1235/Clockaid

Conflicts:
	sound.js