background addition
Merge branch 'master' of git://github.com/eibakke/drinking-app

Merge to get the background of the views implemented