Merge branch 'issue-6-reset-date'
Merge branch 'master' of github.com:shane-tomlinson/rum-diary.org