finish test for foos and trucks
Merge branch 'master' of https://github.com/camicano/food_trucks_app

Conflicts:
	spec/models/user_spec.rb