Added drinks model.
Merge branch 'master' of github.com:bnolan/beervana

Conflicts:
	db/schema.rb