add html form field for delivery options
Merge branch 'master' of github.com:jesserathbun/swirls-store

Conflicts:
	app/views/spree/checkout/_delivery.html.erb