updates
merge conflicts
get trucks
Merge pull request #5 from alexmuro/master

TruckData