Alpha测试版本1
Merge branch 'master' of https://github.com/liuhann/Pomodoro.git

Conflicts:
	web/code.js