added computation for AM and PM
Merge branch 'master' of https://github.com/ghieghiemon/etesdajob