test main
Merge branch 'master' of http://github.com/forsen/Nettbutikk.git