Merge pull request #2 from manonthemat/master

one step closer to the edge
working on many to many functionality for food trucks to food categories
fixing merge issues
fixing file merge times 2
merge issues over?
working on food truck new form
truck model changes
someone needs more coffee