added category relationship test and integration with items and order.

jesus fuck
fixed merge conflicts
Merge pull request #49 from ianderse/luke

Luke
fix merge conflicts, still has rspec errors
ran rake db:migrate, changed schema
yolo'd
fix merge issues and fix order spec
added carousel images and generic food images
fixed circle images, YAY
cleaned up login form
fix merge conflicts
fix category show links
add headers on menu
add static assets precompile
remove description from category spec
merge