Added time-handling.
Merge branch 'master' of https://github.com/ehsanitera/klphackaton.git
Merge branch 'master' of https://github.com/ehsanitera/klphackaton.git