Added fancy landing page etc
Merge branch 'master' of github.com:audreycarlsen/drink_book

Conflicts:
	drink_book/app/controllers/welcome_controller.rb