Added ability to Time track in Git Commit Messages
code cleanup plus some reorder