wait for test fetch
Merge branch 'master' of https://github.com/zhy0216/xtimr

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

Conflicts:
	web/models.py