Disputing the weather on mars
Incorporated Karins and my changes
Merge branch 'karinlag-master'