added x button
took out paypal image
Merge branch 'master' of github.com:blackjacket401/zertica-changed

Conflicts:
	app/views/orders/_credit_card_form.html.slim