Merge branch 'master' of https://github.com/zainz/Brand-og-redning.git