Merge pull request #16 from jeffChavez/parker

Adjustments to drinkView nib. Enable/disable finddrink button whether or...
added launch screen and logo
Merge pull request #17 from jeffChavez/jeff

added launch screen and logo
fix conflict