Pasta with tuna.
Merge branch 'master' of github.com:JeffAbrahamson/recipes

Conflicts:
	pdf/recipes-galaxy-tab-10.1.pdf
	pdf/recipes-gs2.pdf
	pdf/recipes-gs3.pdf
	pdf/recipes-ipad.pdf
	pdf/recipes-iphone4.pdf
	pdf/recipes-iphone5.pdf
Should have been a rename.  Now lotte-armoricaine.