Fixed error where some in-progress hours where being counted.
Merge branch 'master' of github.com:seadsystem/Backend