I don't remember what I was doing, but it likely involved 12/24 hour
time
Merge branch 'master' of https://github.com/sleepers-anonymous/zscore

Conflicts:
	sleep/templatetags/sleep_tags.py