午後12時
Merge branch 'master' of https://github.com/kt2d/reminderbird

Conflicts:
	models.py