added map to home page
Get rid of new Menu
Added better errors
Merge branch 'master' into orders

Conflicts:
	Gemfile.lock
Get rid of the add menu modal
changed map size
Use non-circular logo
hid navbar for
Merge branch 'delivery_views' of https://github.com/kishkaru/project-mule into delivery_views
altered map size
Merge remote-tracking branch 'origin/orders' into delivery_views
added prototype go button
Fixing cucumber
Added daily order view for delivery_areas
Merge remote-tracking branch 'origin/checkout' into orders
Merge remote-tracking branch 'origin/delivery_views' into orders
Restyled the home-page a bit
Merge branch 'orders' into email_system

Conflicts:
	Gemfile
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
adding buttons for texting customers