Updated to canary and format time
Merge branch 'master' of https://github.com/Robdel12/blog