Add time display and fixes to template
Merge branch 'master' of https://github.com/chrischris292/ShowMeTheMoney