oppdatering
Merge branch 'master' of http://github.com/kristofj/bo14-g15