added drink view
added drinkView and animations
tweaking animation properties
fixed merge
Merge pull request #4 from jeffChavez/jeff3

Jeff3