Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
Fix calculation logic for date time
Merge pull request #89 from Tacahilo/hotfix/datetime_logic

Fix calculation logic for date time