Correct song trait values.
Animate show and hide for Cancel button
Adjust drinkview animations.
fix conflict
Comment out gradient for now.
Merge pull request #15 from jeffChavez/parker

Parker