i
Merge branch 'master' of https://github.com/zhy0216/xtimr
backup
Merge branch 'master' of https://github.com/zhy0216/xtimr

Conflicts:
	web/models.py
	web/views.py
wait for debug
Merge branch 'master' of https://github.com/zhy0216/xtimr