Adding time allocations
Merge branch 'develop' of github.com:scaryclam/traffic-api into develop
Fixed some bugs and added in some new classes
Resolved some conflicts