scrolling fixed, pic resize
Merge pull request #6 from wavon/brigitta

scrolling fixed, pic resize
new logo
Merge branch 'master' of https://github.com/wavon/drinkup
Merge branch 'master' into lindsey