fixing conflict
merging tyson/hiromi's trucks_controller changes
wrote tests for new, create on trucks controller, did edit action and tests for it also
pulling down so we can push controller changes