some changes I can't remember and some additional image generation techniques.
some notes.
Merge branch 'master' of github.com:mwhooker/cocktails

Conflicts:
	.DS_Store