Adds tower and elephant logos to assets
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
moves items and order items to admin
Meerge branch 'master' of github.com:MarcGarreau/grubhub_v2
Improves admin and default navbars
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
Updates site-wide font
Updates seed file
Users can add items to the cart
Users cannot add items that do not exist or are disabled
I need to update from master
Removes trailing whitespace from a few places
Adds bullet to track bad queries
Fixes random merge conflicts