Hard code it
Fix am/pm
Merge remote-tracking branch 'heroku/master'