All cocktails added
Merge branch 'master' of github.com:seldridge/cocktails

Conflicts:
	cocktails.tex