added contact us and terms and conditions.
Conflicts:
	app/views/pages/about_us.html.slim
	app/views/pages/terms_and_conditions.html.slim
update gitignore
Conflicts:
	.gitignore
Merge branch 'master' of github.com:stabenfeldt/kaffesmak
fix bug in order_before and shipping_date. Update the confirmation mail.
don't include the footer yet.
fix bug
Merge branch 'master' of github.com:stabenfeldt/kaffesmak

Conflicts:
	app/views/pages/about_us.html.slim
Enough complaining about wrong SSL certificate. Http will do.
added some images for the slideshow
started on the .carousel.slide
ignore *.swp
Added a Roasters sections. Logos and links to affiliated roasters.
Added a few images to a image carousel.
Added more images to the slideshow
use :target => '_blank' for external links
Merge branch 'feature/slideshow' of github.com:stabenfeldt/kaffesmak into feature/slideshow
Fixed captions for the slideshow.