Merge branch 'master' of
ssh://git@github.com/Gruppe21/Prosjekt-it1901.git
mail can now be sent with alarm button!
map updated
Merge branch 'master' of ssh://git@github.com/Gruppe21/exph0001.git
map updated
Merge branch 'master' of ssh://git@github.com/Gruppe21/exph0001.git