Fixed time output
Merge branch 'master' of https://github.com/G-ram/Courses
Merge pull request #132 from G-ram/master

Fixed am/pm bug