break up time
handle hours better
Merge branch 'master' of github.com:Stevonovitch/gitwork