leg til fil
Merge branch 'master' of http://github.com/eirikodal/SKS-2.0