merge conflicts
merge conflicts
design updates
Merge branch 'master' of github.com:mikespangler/tacopella
merged tiff and dan's designs
fixed merge conflicts