new state images implemented
commit to pull
Merge branch 'master' of git://github.com/eibakke/drinking-app

GRRRR git
added button
trying to fix merge errors