Merge pull request #30 from alexcodreanu86/carousel

Carousel
fixed hours transfer from generator to new trip
Merge branch 'master' of http://github.com/alexcodreanu86/nitar into carousel