Christ
Not important
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
predicts pickup time for user orders
fixes merge conflict on user orders displays page
fixed ugle buttons on admin edit
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
Everything gets a shadow
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
fixes order_spec and orders_view_spec
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
Spreadin seeds
Merge branch 'master' of github.com:MarcGarreau/grubhub_v2
Tweaks navbar for display name
mend
Unit prices should now be properly displayed on all parts of the site