Skrev collision
Merge branch 'master' of github.com:Grulfen/solar