Stuff
Return entry page to default
Move CSS into separate file & revert entry page
Adding some structure to the hacks
Button states
Merge conflict
Align the payment pages
Merge branch 'payments-templates' of github.com:alphagov/static into payments-templates
Trying credit card buttons in a row
Merge branch 'payments-templates' of github.com:alphagov/static into payments-templates

Conflicts:
	app/assets/templates/template_styles.css
Add templates to correct location
Merge branch 'master' of github.com:alphagov/static into payments-templates
Remove unwanted files
Move template
Add routes for barclays template etc.

Also use asset pipeline to include stylesheet.
No sass for epdq.
Update button colour to barclay's blue
Merge remote branch 'origin/payments-templates'