It wants me to commit…
Merge remote-tracking branch 'origin/master'
Changed formatting for time etc.
Merge remote-tracking branch 'origin/master'