Add more functionality to checkout page
Merge branch 'master' of github.com:mjs2600/shared_resources

Conflicts:
	web/templates/layouts/application_layout.html.eex